Changeset 5017

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.

Location:

trunk/includes

Files:

• admin/tools.php (modified) (2 diffs)
• common/widgets.php (modified) (3 diffs)
• extend/buddypress/group.php (modified) (1 diff)
• forums/functions.php (modified) (1 diff)

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' ) ) );
+    }
 }
 

trunk/includes/common/widgets.php

@@ -557 +557 @@
 
         // Note: private and hidden forums will be excluded via the
-        // bbp_pre_get_posts_exclude_forums filter and function.
+        // bbp_pre_get_posts_normalize_forum_visibility action and function.
         $widget_query = new WP_Query( array(
             'post_type'           => bbp_get_forum_post_type(),
@@ -781 +781 @@
 
         // Note: private and hidden forums will be excluded via the
-        // bbp_pre_get_posts_exclude_forums filter and function.
+        // bbp_pre_get_posts_normalize_forum_visibility action and function.
         $widget_query = new WP_Query( $topics_query );
 
@@ -1122 +1122 @@
 
         // Note: private and hidden forums will be excluded via the
-        // bbp_pre_get_posts_exclude_forums filter and function.
+        // bbp_pre_get_posts_normalize_forum_visibility action and function.
         $widget_query = new WP_Query( array(
             'post_type'           => bbp_get_reply_post_type(),

trunk/includes/extend/buddypress/group.php

@@ -680 +680 @@
             $this->disconnect_forum_from_group( $group_id );
         }
+
+        // Update bbPress' internal private and forum ID variables
+        bbp_repair_forum_visibility();
 
         // Return the group

trunk/includes/forums/functions.php

@@ -910 +910 @@
 }
 
+/**
+ * Recaches the private and hidden forums
+ *
+ * @since bbPress (r5017)
+ *
+ * @uses delete_option() to delete private and hidden forum pointers
+ * @uses WP_Query() To query post IDs
+ * @uses is_wp_error() To return if error occurred
+ * @uses update_option() To update the private and hidden post ID pointers
+ * @return array An array of the status code and the message
+ */
+function bbp_repair_forum_visibility() {
+
+    // 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'
+    ) );
+
+    // Reset the $post global
+    wp_reset_postdata();
+
+    // Bail if queries returned errors
+    if ( is_wp_error( $private_forums ) || is_wp_error( $hidden_forums ) )
+        return false;
+
+    // Update the private/hidden options
+    update_option( '_bbp_private_forums', $private_forums->posts ); // Private forums
+    update_option( '_bbp_hidden_forums',  $hidden_forums->posts  ); // Hidden forums
+
+    // Complete results
+    return true;
+}
+
 /** Count Bumpers *************************************************************/