Ticket #6865: 6865.2.diff

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

@@ -554 +554 @@
 
         $post_types = bp_activity_get_post_types_tracking_args();
 
+        $do_sort = false;
+
         // Create the actions for the post types, if they haven't already been created.
         if ( ! empty( $post_types ) ) {
                 foreach ( $post_types as $post_type ) {
@@ -570 +572 @@
                                 $post_type->contexts,
                                 $post_type->position
                         );
+
+                        $do_sort = true;
                 }
         }
 
-        // 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' );
+        // If the actions have been modified, sort by their position within each component.
+        if ( $do_sort ) {
+                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;
+                        // Restore keys.
+                        $bp->activity->actions->{$component} = new stdClass;
+                        foreach ( $temp as $key_ordered ) {
+                                $bp->activity->actions->{$component}->{$key_ordered['key']} = $key_ordered;
+                        }
                 }
         }