Changeset 6357

Timestamp:

09/28/2012 10:41:20 PM (12 years ago)

Author:

djpaul

Message:

Remove the bb-config.php file when group forums are uninstalled. Fixes #4397, props r-a-y

This change helps tidy up bbPress 1.x remnants when group forums are uninstalled. As this file
is automatically generated when bbPress 1.x group forums are installed, a user can reactivate the
old group forums and we'll rebuild the bb-config.php for them.

Location:

trunk

Files:

• bp-core/admin/bp-core-functions.php (modified) (1 diff)
• bp-forums/bp-forums-admin.php (modified) (2 diffs)

trunk/bp-core/admin/bp-core-functions.php

@@ -376 +376 @@
     do_action( 'bp_admin_tabs' );
 }
+
+/**
+ * Add the confirmation inline javascript in the WP admin dashboard.
+ *
+ * Only add it if we're not in BP maintenance mode.
+ *
+ * @since BuddyPress (1.7)
+ * @uses bp_get_maintenance_mode() To see if we're in BP maintenance mode.
+ * @uses bp_core_confirmation_js() To output our inline JS.
+ */
+function bp_core_admin_add_confirm_js() { 
+    if ( ! bp_get_maintenance_mode() )
+        bp_core_confirmation_js();
+} 
+add_action( 'admin_head', 'bp_core_admin_add_confirm_js' ); 

trunk/bp-forums/bp-forums-admin.php

@@ -59 +59 @@
             // Delete the bb-config.php location option
             bp_delete_option( 'bb-config-location' );
+
+            // Now delete the bb-config.php file
+            @unlink( ABSPATH . 'bb-config.php' );
+
+            // show the updated wizard
             bp_forums_bbpress_install_wizard();
 
@@ -78 +83 @@
 
                 <div>
-                    <a class="button button-primary" href="<?php echo $action ?>"><?php _e( 'Uninstall Group Forums', 'buddypress' ) ?></a> &nbsp;
+                    <a class="button button-primary confirm" href="<?php echo $action ?>"><?php _e( 'Uninstall Group Forums', 'buddypress' ) ?></a> &nbsp;
                 </div>
             </div>