Changeset 6535

Timestamp:

06/12/2017 09:54:05 PM (8 years ago)

Author:

johnjamesjacoby

Message:

Bump trunk to 2.6 Release Candidate 3.

Location:

trunk

Files:

• bbpress.php (modified) (1 diff)
• src/bbpress.php (modified) (2 diffs)
• src/includes/core/update.php (modified) (1 diff)
• src/readme.txt (modified) (1 diff)

trunk/bbpress.php

@@ -18 +18 @@
  * Author:      The bbPress Contributors
  * Author URI:  https://bbpress.org
- * Version:     2.6-rc-1
+ * Version:     2.6-rc-3
  * Text Domain: bbpress
  * Domain Path: /languages/

trunk/src/bbpress.php

@@ -18 +18 @@
  * Author:      The bbPress Contributors
  * Author URI:  https://bbpress.org
- * Version:     2.6-rc-1
+ * Version:     2.6-rc-3
  * Text Domain: bbpress
  * Domain Path: /languages/
@@ -205 +205 @@
         /** Versions **********************************************************/
 
-        $this->version    = '2.6-rc-6513';
-        $this->db_version = '261';
+        $this->version    = '2.6-rc-6535';
+        $this->db_version = '262';
 
         /** Paths *************************************************************/

trunk/src/includes/core/update.php

@@ -329 +329 @@
 
             /**
-             * Upgrade user favorites, subscriptions, and engagements
+             * Upgrade user favorites and subscriptions
              *
              * @link https://bbpress.trac.wordpress.org/ticket/2959
+             */
+            if ( ! bbp_is_large_install() ) {
+                bbp_admin_upgrade_user_favorites();
+                bbp_admin_upgrade_user_topic_subscriptions();
+                bbp_admin_upgrade_user_forum_subscriptions();
+            }
+        }
+
+        if ( $raw_db_version < 262 ) {
+
+            /**
+             * Upgrade user engagements
+             *
              * @link https://bbpress.trac.wordpress.org/ticket/3068
              */
             if ( ! bbp_is_large_install() ) {
                 bbp_admin_upgrade_user_engagements();
-                bbp_admin_upgrade_user_favorites();
-                bbp_admin_upgrade_user_topic_subscriptions();
-                bbp_admin_upgrade_user_forum_subscriptions();
             }
         }

trunk/src/readme.txt

@@ -4 +4 @@
 Requires at least: 4.7
 Tested up to: 4.8
-Stable tag: 2.5.11
+Stable tag: 2.5.12
 License: GPLv2 or later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html