Changeset 4104

Timestamp:

07/22/2012 10:09:36 PM (12 years ago)

Author:

johnjamesjacoby

Message:

Forum Visibility:

• Prevent forum metaboxes from saving forum revisions as private/hidden.
• Add repair function for private/hidden forums to Tools.
• Add updater for 2.1.1, and run the visibility repair function.
• Fixes #1891.
• For 2.1 branch.

Location:

branches/2.1

Files:

• bbp-admin/bbp-forums.php (modified) (1 diff)
• bbp-admin/bbp-tools.php (modified) (2 diffs)
• bbp-includes/bbp-core-update.php (modified) (2 diffs)
• bbp-includes/bbp-forum-functions.php (modified) (1 diff)
• bbpress.php (modified) (1 diff)

branches/2.1/bbp-admin/bbp-forums.php

@@ -303 +303 @@
             return $forum_id;
 
+        // Only save for forum post-types
+        if ( ! bbp_is_forum( $forum_id ) )
+            return $forum_id;
+
         // Bail if current user cannot edit this forum
         if ( !current_user_can( 'edit_forum', $forum_id ) )

branches/2.1/bbp-admin/bbp-tools.php

@@ -160 +160 @@
         0  => array( 'bbp-sync-topic-meta',        __( 'Recalculate the parent topic for each post',          'bbpress' ), 'bbp_admin_repair_topic_meta'               ),
         5  => array( 'bbp-sync-forum-meta',        __( 'Recalculate the parent forum for each post',          'bbpress' ), 'bbp_admin_repair_forum_meta'               ),
-        10 => array( 'bbp-forum-topics',           __( 'Count topics in each forum',                          'bbpress' ), 'bbp_admin_repair_forum_topic_count'        ),
-        15 => array( 'bbp-forum-replies',          __( 'Count replies in each forum',                         'bbpress' ), 'bbp_admin_repair_forum_reply_count'        ),
-        20 => array( 'bbp-topic-replies',          __( 'Count replies in each topic',                         'bbpress' ), 'bbp_admin_repair_topic_reply_count'        ),
-        25 => array( 'bbp-topic-voices',           __( 'Count voices in each topic',                          'bbpress' ), 'bbp_admin_repair_topic_voice_count'        ),
-        30 => array( 'bbp-topic-hidden-replies',   __( 'Count spammed & trashed replies in each topic',       'bbpress' ), 'bbp_admin_repair_topic_hidden_reply_count' ),
-        35 => array( 'bbp-user-replies',           __( 'Count topics for each user',                          'bbpress' ), 'bbp_admin_repair_user_topic_count'         ),
-        35 => array( 'bbp-user-topics',            __( 'Count replies for each user',                         'bbpress' ), 'bbp_admin_repair_user_reply_count'         ),
-        40 => array( 'bbp-user-favorites',         __( 'Remove trashed topics from user favorites',           'bbpress' ), 'bbp_admin_repair_user_favorites'           ),
-        45 => array( 'bbp-user-subscriptions',     __( 'Remove trashed topics from user subscriptions',       'bbpress' ), 'bbp_admin_repair_user_subscriptions'       ),
-        50 => array( 'bbp-sync-all-topics-forums', __( 'Recalculate last activity in each topic and forum',   'bbpress' ), 'bbp_admin_repair_freshness'                )
+        10 => array( 'bbp-sync-forum-visibility',  __( 'Recalculate private and hidden forums',               'bbpress' ), 'bbp_admin_repair_forum_visibility'         ),
+        15 => array( 'bbp-forum-topics',           __( 'Count topics in each forum',                          'bbpress' ), 'bbp_admin_repair_forum_topic_count'        ),
+        20 => array( 'bbp-forum-replies',          __( 'Count replies in each forum',                         'bbpress' ), 'bbp_admin_repair_forum_reply_count'        ),
+        25 => array( 'bbp-topic-replies',          __( 'Count replies in each topic',                         'bbpress' ), 'bbp_admin_repair_topic_reply_count'        ),
+        30 => array( 'bbp-topic-voices',           __( 'Count voices in each topic',                          'bbpress' ), 'bbp_admin_repair_topic_voice_count'        ),
+        35 => array( 'bbp-topic-hidden-replies',   __( 'Count spammed & trashed replies in each topic',       'bbpress' ), 'bbp_admin_repair_topic_hidden_reply_count' ),
+        40 => array( 'bbp-user-replies',           __( 'Count topics for each user',                          'bbpress' ), 'bbp_admin_repair_user_topic_count'         ),
+        45 => array( 'bbp-user-topics',            __( 'Count replies for each user',                         'bbpress' ), 'bbp_admin_repair_user_reply_count'         ),
+        50 => array( 'bbp-user-favorites',         __( 'Remove trashed topics from user favorites',           'bbpress' ), 'bbp_admin_repair_user_favorites'           ),
+        55 => array( 'bbp-user-subscriptions',     __( 'Remove trashed topics from user subscriptions',       'bbpress' ), 'bbp_admin_repair_user_subscriptions'       ),
+        60 => array( 'bbp-sync-all-topics-forums', __( 'Recalculate last activity in each topic and forum',   'bbpress' ), 'bbp_admin_repair_freshness'                )
     );
     ksort( $repair_list );
@@ -679 +680 @@
     }
     
+    // Complete results
+    $result = __( 'Complete!', 'bbpress' );
+    return array( 0, sprintf( $statement, $result ) );
+}
+
+/**
+ * Recaches the private and hidden forums
+ *
+ * @since bbPress (r4104)
+ *
+ * @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_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
+
     // Complete results
     $result = __( 'Complete!', 'bbpress' );

branches/2.1/bbp-includes/bbp-core-update.php

@@ -140 +140 @@
     // Are we running an outdated version of bbPress?
     if ( bbp_is_update() ) {
+
+        // Call the automated updater
+        bbp_version_updater();
 
         // Bump the version
@@ -210 +213 @@
     );
 }
+
+/**
+ * bbPress's version updater looks at what the current database version is, and
+ * runs whatever other code is needed.
+ *
+ * This is most-often used when the data schema changes, but should also be used
+ * to correct issues with bbPress meta-data silently on software update.
+ *
+ * @since bbPress (r4104)
+ */
+function bbp_version_updater() {
+
+    // Get the raw database version
+    $raw_db_version = (int) bbp_get_db_version_raw();
+
+    // Bail if no database version exists
+    if ( empty( $raw_db_version ) )
+        return;
+
+    /** 2.0 Branch ************************************************************/
+
+    // 2.0, 2.0.1, 2.0.2, 2.0.3
+    if ( $raw_db_version < 200 ) {
+        // Do nothing
+    }
+
+    /** 2.1 Branch ************************************************************/
+
+    // 2.1, 2.1.1
+    if ( $raw_db_version < 211 ) {
+
+        /**
+         * Repair private and hidden forum data
+         *
+         * @link http://bbpress.trac.wordpress.org/ticket/1891
+         */
+        bbp_admin_repair_forum_visibility();
+    }
+
+    /** 2.2 Branch ************************************************************/
+
+    // 2.2
+    if ( $raw_db_version < 220 ) {
+        // No changes yet
+    }
+}

branches/2.1/bbp-includes/bbp-forum-functions.php

@@ -612 +612 @@
 
     // Bail if forum ID is empty
-    if ( empty( $forum_id ) )
+    if ( empty( $forum_id ) || ! bbp_is_forum( $forum_id ) )
         return;
 

branches/2.1/bbpress.php

@@ -175 +175 @@
 
         $this->version    = '2.1'; // bbPress version
-        $this->db_version = '210'; // bbPress DB version
+        $this->db_version = '211'; // bbPress DB version
 
         /** Paths *************************************************************/