Changeset 11236

Timestamp:

11/04/2016 06:23:40 PM (10 years ago)

Author:

johnjamesjacoby

Message:

Deprecation: Move the bp_get_option() check down into a place where the function is actually available.

Unbreaks trunk from r11233. See #7307.

File:

• trunk/src/bp-loader.php (modified) (2 diffs)

trunk/src/bp-loader.php

@@ -337 +337 @@
                  * @since 2.8.0 Defaults to true on upgrades, false for new installs.
                  */
-                $this->load_deprecated = ! bp_get_option( '_bp_ignore_deprecated_code', true );
+                $this->load_deprecated = false;
 
                 /** Toolbar ***********************************************************/
@@ -508 +508 @@
                 }
 
-                // Maybe load deprecated functionality
-                if ( true === $this->load_deprecated ) {
+                // Maybe load deprecated functionality (this double negative is proof positive!)
+                if ( ! bp_get_option( '_bp_ignore_deprecated_code', ! $this->load_deprecated ) ) {
                         require( $this->plugin_dir . 'bp-core/deprecated/1.2.php' );
                         require( $this->plugin_dir . 'bp-core/deprecated/1.5.php' );