Changeset 8323

Timestamp:

04/26/2014 05:13:30 PM (10 years ago)

Author:

boonebgorges

Message:

Don't attempt to overload add_root property in bp_core_add_root_component()

The add_root array is defined only for backward compatibility purposes in the
BuddyPress global object, and thus is overloaded rather than defined in the
constructor. This means that adding items directly to the array is forbidden
on recent versions of PHP. As a workaround, we add the item as a separate array
and then swap the array, which is allowed and will not result in notices.

Fixes #5588

Location:

trunk

Files:

• bp-core/bp-core-functions.php (modified) (1 diff)
• tests/testcases/core/functions.php (modified) (1 diff)

trunk/bp-core/bp-core-functions.php

@@ -562 +562 @@
     // If there was no match, add a page for this root component
     if ( empty( $match ) ) {
-        $bp->add_root[] = $slug;
+        $add_root_items   = $bp->add_root();
+        $add_root_items[] = $slug;
+        $bp->add_root     = $add_root_items;
     }
 

trunk/tests/testcases/core/functions.php

@@ -331 +331 @@
         }
     }
+
+    /**
+     * @group bp_core_add_root_component
+     */
+    public function test_add_root_component_not_in_bp_pages() {
+        buddypress()->foo = new stdClass;
+        buddypress()->foo->id = 'foo';
+        buddypress()->foo->slug = 'foo';
+
+        bp_core_add_root_component( 'foo' );
+
+        $this->assertTrue( in_array( 'foo', buddypress()->add_root ) );
+        $this->assertTrue( buddypress()->foo->has_directory );
+        $this->assertNotEmpty( buddypress()->loaded_components['foo'] );
+    }
 }