Skip to:
Content

BuddyPress.org

Changeset 11236


Ignore:
Timestamp:
11/04/2016 06:23:40 PM (4 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:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/bp-loader.php

    r11233 r11236  
    337337         * @since 2.8.0 Defaults to true on upgrades, false for new installs.
    338338         */
    339         $this->load_deprecated = ! bp_get_option( '_bp_ignore_deprecated_code', true );
     339        $this->load_deprecated = false;
    340340
    341341        /** Toolbar ***********************************************************/
     
    508508        }
    509509
    510         // Maybe load deprecated functionality
    511         if ( true === $this->load_deprecated ) {
     510        // Maybe load deprecated functionality (this double negative is proof positive!)
     511        if ( ! bp_get_option( '_bp_ignore_deprecated_code', ! $this->load_deprecated ) ) {
    512512            require( $this->plugin_dir . 'bp-core/deprecated/1.2.php' );
    513513            require( $this->plugin_dir . 'bp-core/deprecated/1.5.php' );
Note: See TracChangeset for help on using the changeset viewer.