Changeset 5017 for trunk/includes/admin/tools.php

Timestamp:

07/10/2013 07:17:14 AM (12 years ago)

Author:

johnjamesjacoby

Message:

Introduce bbp_repair_forum_visibility() and use it:

• when creating a new BuddyPress Group Forum
• in the bbp_admin_repair_forum_visibility() tool

Fixes issues with new group forums not bumping the private/hidden forum ID's. Props r-a-y. Fixes #2349.

File:

• trunk/includes/admin/tools.php (modified) (2 diffs)

trunk/includes/admin/tools.php

@@ -91 +91 @@
 
     foreach ( (array) bbp_admin_repair_list() as $item ) {
-        if ( isset( $item[2] ) && isset( $_POST[$item[0]] ) && 1 === $_POST[$item[0]] && is_callable( $item[2] ) ) {
+        if ( isset( $item[2] ) && isset( $_POST[$item[0]] ) && 1 === absint( $_POST[$item[0]] ) && is_callable( $item[2] ) ) {
             $messages[] = call_user_func( $item[2] );
         }
@@ -938 +938 @@
  */
 function bbp_admin_repair_forum_visibility() {
-
     $statement = __( 'Recalculating forum visibility … %s', 'bbpress' );
-    $result    = __( 'Failed!', 'bbpress' );
-
-    // First, delete everything.
-    delete_option( '_bbp_private_forums' );
-    delete_option( '_bbp_hidden_forums'  );
-
-    // Next, get all the private and hidden forums
-    $private_forums = new WP_Query( array(
-        'suppress_filters' => true,
-        'nopaging'         => true,
-        'post_type'        => bbp_get_forum_post_type(),
-        'post_status'      => bbp_get_private_status_id(),
-        'fields'           => 'ids'
-    ) );
-    $hidden_forums = new WP_Query( array(
-        'suppress_filters' => true,
-        'nopaging'         => true,
-        'post_type'        => bbp_get_forum_post_type(),
-        'post_status'      => bbp_get_hidden_status_id(),
-        'fields'           => 'ids'
-    ) );
 
     // Bail if queries returned errors
-    if ( is_wp_error( $private_forums ) || is_wp_error( $hidden_forums ) )
-        return array( 2, sprintf( $statement, $result ) );
-
-    update_option( '_bbp_private_forums', $private_forums->posts ); // Private forums
-    update_option( '_bbp_hidden_forums',  $hidden_forums->posts  ); // Hidden forums
-
-    // Reset the $post global
-    wp_reset_postdata();
+    if ( ! bbp_repair_forum_visibility() ) {
+        return array( 2, sprintf( $statement, __( 'Failed!',   'bbpress' ) ) );
 
     // Complete results
-    return array( 0, sprintf( $statement, __( 'Complete!', 'bbpress' ) ) );
+    } else {
+        return array( 0, sprintf( $statement, __( 'Complete!', 'bbpress' ) ) );
+    }
 }