Changeset 13195

Timestamp:

12/23/2021 02:27:58 PM (5 years ago)

Author:

dcavins

Message:

Improve behavior of bp_init_group_extensions().

In r13101, the behavior of bp_register_group_extension()
was changed to make it possible to modify the behavior via
plugins. However, the same code in a new place behaved
differently, only fully registering the last group extension that
was passed to it. This commit stops passing the group
extension classes by reference, which fixes the issue.

See #8558.

Location:

trunk

Files:

• src/bp-groups/bp-groups-functions.php (modified) (1 diff)
• tests/phpunit/testcases/groups/class-bp-group-extension.php (modified) (1 diff)

trunk/src/bp-groups/bp-groups-functions.php

@@ -3674 +3674 @@
                 $extension = new $group_extension_class;
 
-                add_action( 'bp_actions', array( &$extension, '_register' ), 8 );
-                add_action( 'admin_init', array( &$extension, '_register' ) );
+                add_action( 'bp_actions', array( $extension, '_register' ), 8 );
+                add_action( 'admin_init', array( $extension, '_register' ) );
         }
 }

trunk/tests/phpunit/testcases/groups/class-bp-group-extension.php

@@ -888 +888 @@
                 $this->assertFalse( $content === 'Widget Displayed' );
         }
+
+        /**
+         * @ticket BP8558
+         */
+        public function test_adding_multiple_extension_classes() {
+                $old_options_nav = buddypress()->bp_options_nav;
+
+                $g = self::factory()->group->create();
+                $g_obj = groups_get_group( $g );
+
+                $e = new BPTest_Group_Extension_Enable_Nav_Item_True();
+                $e_slug = 'bptest_group_extension_enable_nav_item_true';
+                $e_class_name = get_class( $e );
+                $f = new BPTest_Group_Extension_Access_Anyone();
+                $f_slug = 'bptest_group_extension_access_anyone';
+                $f_class_name = get_class( $f );
+
+                bp_register_group_extension( $e_class_name );
+                bp_register_group_extension( $f_class_name );
+
+                $this->go_to( bp_get_group_permalink( $g_obj ) );
+                $nav = buddypress()->groups->nav->get_secondary( array(
+                        'parent_slug' => $g_obj->slug ,
+                ) );
+
+                $slugs = array();
+                foreach ( $nav as $priority => $nav_obj ) {
+                        $slugs[] = $nav_obj->slug;
+                }
+
+                $this->assertTrue( in_array( $e_slug, $slugs, true ) && in_array( $f_slug, $slugs, true ) );
+
+                // Clean up
+                buddypress()->bp_options_nav = $old_options_nav;
+        }
 }