Changeset 11105

Timestamp:

09/15/2016 08:19:52 PM (8 years ago)

Author:

djpaul

Message:

Core: stop loading deprecated code files for new installs from 2.7 onwards.

Existing installs will continue to load the deprecated code.

Fixes #6839

Location:

trunk/src

Files:

• bp-core/bp-core-options.php (modified) (1 diff)
• bp-core/bp-core-update.php (modified) (3 diffs)
• bp-loader.php (modified) (3 diffs)

trunk/src/bp-core/bp-core-options.php

@@ -101 +101 @@
         '_bp_force_buddybar'                   => false,
 
-        /* Legacy theme *********************************************/
+        /* Legacy *********************************************/
 
         // Whether to register the bp-default themes directory.
         '_bp_retain_bp_default'                => false,
+
+        // Whether to load deprecated code.
+        '_bp_ignore_deprecated_code'           => true,
 
         /* Widgets **************************************************/

trunk/src/bp-core/bp-core-update.php

@@ -266 +266 @@
 
         // Version 2.7.0.
-        if ( $raw_db_version < 11079 ) {
+        if ( $raw_db_version < 11105 ) {
             bp_update_to_2_7();
         }
@@ -511 +511 @@
  * - Add email unsubscribe salt.
  * - Save legacy directory titles to the corresponding WP pages.
+ * - Add ignore deprecated code option (false for updates).
  *
  * @since 2.7.0
@@ -537 +538 @@
         }
     }
+
+    // Load deprecated code for existing installs.
+    bp_add_option( '_bp_ignore_deprecated_code', false );
 }
 

trunk/src/bp-loader.php

@@ -309 +309 @@
         // Whether to refrain from loading deprecated functions
         if ( ! defined( 'BP_IGNORE_DEPRECATED' ) ) {
-            define( 'BP_IGNORE_DEPRECATED', false );
+            define( 'BP_IGNORE_DEPRECATED', true );
         }
 
@@ -332 +332 @@
 
         $this->version    = '2.7-alpha';
-        $this->db_version = 11084;
+        $this->db_version = 11105;
 
         /** Loading ***********************************************************/
 
         /**
-         * Filters the load_deprecated property value.
+         * Whether to load deprecated code or not.
          *
          * @since 2.0.0
+         * @since 2.7.0 Defaults to false (do not load deprecated code) for new installs.
          *
          * @const constant BP_IGNORE_DEPRECATED Whether or not to ignore deprecated functionality.
@@ -510 +511 @@
 
         // Skip or load deprecated content
-        if ( false !== $this->load_deprecated ) {
+        if ( $this->load_deprecated || ! bp_get_option( '_bp_ignore_deprecated_code' ) ) {
             require( $this->plugin_dir . 'bp-core/deprecated/1.2.php' );
             require( $this->plugin_dir . 'bp-core/deprecated/1.5.php' );