Ticket #4397: 4397.01.patch

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

@@ -396 +396 @@
         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.6.1)
+ * @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' );
+
 ?>

bp-forums/bp-forums-admin.php

@@ -60 +60 @@
 
                         // 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();
 
                 else : ?>
@@ -79 +84 @@
                                 </ul>
 
                                 <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>