Changeset 11233

Timestamp:

11/04/2016 03:49:51 PM (10 years ago)

Author:

johnjamesjacoby

Message:

Loader: Make sure deprecated code is ignored unless explicitly defined to be included.

Also deprecate the BP_IGNORE_DEPRECATED constant, since this is now an option. (We'll still obey it if it's set later.)

See: #7307, #7323, #7322. For trunk.

Location:

trunk/src

Files:

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

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

@@ -103 +103 @@
                 /* Legacy *********************************************/
 
-                // Whether to register the bp-default themes directory.
+                // Do not register the bp-default themes directory.
                 '_bp_retain_bp_default'                => false,
 
-                // Whether to load deprecated code.
+                // Ignore deprecated code.
                 '_bp_ignore_deprecated_code'           => true,
 

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

@@ -539 +539 @@
         }
 
-        // Load deprecated code for existing installs.
+        // Do not ignore deprecated code for existing installs.
         bp_add_option( '_bp_ignore_deprecated_code', false );
 }

trunk/src/bp-loader.php

@@ -307 +307 @@
                 }
 
-                // Whether to refrain from loading deprecated functions
-                if ( ! defined( 'BP_IGNORE_DEPRECATED' ) ) {
-                        define( 'BP_IGNORE_DEPRECATED', true );
-                }
-
                 // The search slug has to be defined nice and early because of the way
                 // search requests are loaded
@@ -337 +332 @@
 
                 /**
-                 * Whether to load deprecated code or not.
+                 * Should deprecated code be loaded?
                  *
-                 * @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.
-                 */
-                $this->load_deprecated = ! apply_filters( 'bp_ignore_deprecated', BP_IGNORE_DEPRECATED );
+                 * @since 2.0.0 Defaults to false always
+                 * @since 2.8.0 Defaults to true on upgrades, false for new installs.
+                 */
+                $this->load_deprecated = ! bp_get_option( '_bp_ignore_deprecated_code', true );
 
                 /** Toolbar ***********************************************************/
@@ -457 +450 @@
                 if ( ! defined( 'BP_DB_VERSION' ) ) {
                         define( 'BP_DB_VERSION', $this->db_version );
+                }
+
+                // Define if deprecated functions should be ignored
+                if ( ! defined( 'BP_IGNORE_DEPRECATED' ) ) {
+                        define( 'BP_IGNORE_DEPRECATED', true );
                 }
         }
@@ -510 +508 @@
                 }
 
-                // Skip or load deprecated content
-                if ( $this->load_deprecated || ! bp_get_option( '_bp_ignore_deprecated_code' ) ) {
+                // Maybe load deprecated functionality
+                if ( true === $this->load_deprecated ) {
                         require( $this->plugin_dir . 'bp-core/deprecated/1.2.php' );
                         require( $this->plugin_dir . 'bp-core/deprecated/1.5.php' );