Changeset 11361

Timestamp:

12/29/2016 09:04:59 PM (8 years ago)

Author:

boonebgorges

Message:

Remove conditional checks for initializing navigation back compat.

Nav back compat requires ArrayAccess, which is only guaranteed to
be available in PHP 5.3+.

See #7299.

Location:

trunk/src

Files:

• bp-core/bp-core-buddybar.php (modified) (2 diffs)
• bp-core/classes/class-bp-core.php (modified) (1 diff)
• bp-loader.php (modified) (2 diffs)

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

@@ -801 +801 @@
 
     // Reset backcompat nav items so that subsequent references will be correct.
-    if ( buddypress()->do_nav_backcompat ) {
-        $bp->bp_nav->reset();
-        $bp->bp_options_nav->reset();
-    }
+    $bp->bp_nav->reset();
+    $bp->bp_options_nav->reset();
 
     if ( ! is_array( $screen_functions ) ) {
@@ -852 +850 @@
 
     // Reset backcompat nav items so that subsequent references will be correct.
-    if ( buddypress()->do_nav_backcompat ) {
-        $bp->bp_nav->reset();
-        $bp->bp_options_nav->reset();
-    }
+    $bp->bp_nav->reset();
+    $bp->bp_options_nav->reset();
 
     if ( ! is_array( $screen_functions ) ) {

trunk/src/bp-core/classes/class-bp-core.php

@@ -255 +255 @@
 
         // Backward compatibility for plugins modifying the legacy bp_nav and bp_options_nav global properties.
-        if ( buddypress()->do_nav_backcompat ) {
-            $bp->bp_nav         = new BP_Core_BP_Nav_BackCompat();
-            $bp->bp_options_nav = new BP_Core_BP_Options_Nav_BackCompat();
-        }
+        $bp->bp_nav         = new BP_Core_BP_Nav_BackCompat();
+        $bp->bp_options_nav = new BP_Core_BP_Options_Nav_BackCompat();
 
         /**

trunk/src/bp-loader.php

@@ -110 +110 @@
     public $do_autoload = true;
 
-    /**
-     * Whether to load backward compatibility classes for navigation globals.
-     *
-     * @since 2.6.0
-     * @var bool
-     */
-    public $do_nav_backcompat = false;
-
     /** Option Overload *******************************************************/
 
@@ -424 +416 @@
         $this->email_post_type     = apply_filters( 'bp_email_post_type', 'bp-email' );
         $this->email_taxonomy_type = apply_filters( 'bp_email_tax_type', 'bp-email-type' );
-
-        /** Navigation backward compatibility *********************************/
-        if ( interface_exists( 'ArrayAccess', false ) ) {
-            // bp_nav and bp_options_nav compatibility depends on SPL.
-            $this->do_nav_backcompat = true;
-        }
     }