Ticket #4786: 4786.patch

bp-activity/bp-activity-admin.php

@@ -762 +762 @@
         unset( $actions['friends_register_activity_action'] );
 
         // Sort array by the human-readable value
-        natsort( $actions ); ?>
+        natsort( $actions );
+
+        // If the activity type is not registered properly (eg, a plugin has
+        // not called bp_activity_set_action()), add the raw type to the end
+        // of the list
+        if ( ! isset( $actions[ $selected ] ) ) {
+                $actions[ $selected ] = $selected;
+        }
+
+        ?>
 
         <select name="bp-activities-type">
                 <?php foreach ( $actions as $k => $v ) : ?>