Changeset 10515

Timestamp:

02/05/2016 03:37:27 AM (11 years ago)

Author:

boonebgorges

Message:

Sort activity actions when they're added, instead of when they're fetched.

Sorting activity actions can be an expensive process, so should not be done
any more frequently than necessary. And it's only necessary to sort when a
new action has been added. So instead of sorting in bp_activity_get_actions(),
we now do it in bp_activity_set_action().

Props boonebgorges, imath.
Fixes #6865.

Location:

trunk

Files:

• src/bp-activity/bp-activity-functions.php (modified) (2 diffs)
• tests/phpunit/testcases/activity/functions (added)
• tests/phpunit/testcases/activity/functions.php (modified) (1 diff)
• tests/phpunit/testcases/activity/functions/bpActivityGetActions.php (added)

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

@@ -385 +385 @@
                 'position'        => $position,
         ), $component_id, $type, $description, $format_callback, $label, $context );
+
+        // Sort the actions of the affected component.
+        $action_array = (array) $bp->activity->actions->{$component_id};
+        $action_array = bp_sort_by_key( $action_array, 'position', 'num' );
+
+        // Restore keys.
+        $bp->activity->actions->{$component_id} = new stdClass;
+        foreach ( $action_array as $key_ordered ) {
+                $bp->activity->actions->{$component_id}->{$key_ordered['key']} = $key_ordered;
+        }
 
         return true;
@@ -571 +581 @@
                                 $post_type->position
                         );
-                }
-        }
-
-        // Sort the actions by their position within each component.
-        foreach ( $bp->activity->actions as $component => $actions ) {
-                $actions = (array) $actions;
-                $temp = bp_sort_by_key( $actions, 'position', 'num' );
-
-                // Restore keys.
-                $bp->activity->actions->{$component} = new stdClass;
-                foreach ( $temp as $key_ordered ) {
-                        $bp->activity->actions->{$component}->{$key_ordered['key']} = $key_ordered;
                 }
         }

trunk/tests/phpunit/testcases/activity/functions.php

@@ -870 +870 @@
         }
 
-        /**
-         * @group activity_action
-         * @group bp_activity_get_actions
-         */
-        public function test_bp_activity_get_actions_should_sort_by_position() {
-                $old_actions = bp_activity_get_actions();
-                buddypress()->activity->actions = new stdClass;
-
-                register_post_type( 'foo5', array(
-                        'public'      => true,
-                        'supports'    => array( 'buddypress-activity' ),
-                        'bp_activity' => array(
-                                'component_id' => 'foo',
-                                'action_id' => 'foo_bar_5',
-                                'position' => 5,
-                        ),
-                ) );
-
-                register_post_type( 'foo50', array(
-                        'public'      => true,
-                        'supports'    => array( 'buddypress-activity' ),
-                        'bp_activity' => array(
-                                'component_id' => 'foo',
-                                'action_id' => 'foo_bar_50',
-                                'position' => 50,
-                        ),
-                ) );
-
-                register_post_type( 'foo25', array(
-                        'public'      => true,
-                        'supports'    => array( 'buddypress-activity' ),
-                        'bp_activity' => array(
-                                'component_id' => 'foo',
-                                'action_id' => 'foo_bar_25',
-                                'position' => 25,
-                        ),
-                ) );
-
-                $actions = bp_activity_get_actions();
-
-                $expected = array(
-                        'foo_bar_5',
-                        'foo_bar_25',
-                        'foo_bar_50',
-                );
-                $foo_actions = (array) $actions->foo;
-                $this->assertEquals( $expected, array_values( wp_list_pluck( $foo_actions, 'key' ) ) );
-
-                buddypress()->activity->actions = $old_actions;
-        }
 
         /**