Changeset 6832

Timestamp:

03/03/2013 08:45:16 PM (14 years ago)

Author:

boonebgorges

Message:

Introduces bp_admin_list_table_current_bulk_action() and applies to group and activity admin pages

WP_List_Table pages have top and bottom bulk action dropdowns: 'action' and
'action2'. This changeset reconciles these two dropdowns on form submit.

See #4861

Hat tip to imath for original patch

Location:

trunk

Files:

• bp-activity/bp-activity-admin.php (modified) (1 diff)
• bp-core/admin/bp-core-functions.php (modified) (1 diff)
• bp-groups/bp-groups-admin.php (modified) (1 diff)

trunk/bp-activity/bp-activity-admin.php

@@ -183 +183 @@
         $min = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : 'min.';
 
-        // Bottom bulk action hack
-        if ( !empty( $_REQUEST['action2'] ) ) {
-                $_REQUEST['action'] = $_REQUEST['action2'];
-                unset( $_REQUEST['action2'] );
-        }
-
-        // Decide whether to load the index or edit screen
-        $doaction = ! empty( $_REQUEST['action'] ) ? $_REQUEST['action'] : '';
+        $doaction = bp_admin_list_table_current_bulk_action();
 
         // Call an action for plugins to hook in early

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

@@ -604 +604 @@
         return $bp_menu_order;
 }
+
+/** Utility  *****************************************************************/
+
+/**
+ * When using a WP_List_Table, get the currently selected bulk action
+ *
+ * WP_List_Tables have bulk actions at the top and at the bottom of the tables,
+ * and the inputs have different keys in the $_REQUEST array. This function
+ * reconciles the two values and returns a single action being performed.
+ *
+ * @since BuddyPress (1.7)
+ * @return string
+ */
+function bp_admin_list_table_current_bulk_action() {
+
+        $action = ! empty( $_REQUEST['action'] ) ? $_REQUEST['action'] : '';
+
+        // If the bottom is set, let it override the action
+        if ( ! empty( $_REQUEST['action2'] ) && $_REQUEST['action2'] != "-1" ) {
+                $action = $_REQUEST['action2'];
+        }
+
+        return $action;
+}

trunk/bp-groups/bp-groups-admin.php

@@ -76 +76 @@
         $min = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : 'min.';
 
-        // Bottom bulk action hack
-        if ( !empty( $_REQUEST['action2'] ) ) {
-                $_REQUEST['action'] = $_REQUEST['action2'];
-                unset( $_REQUEST['action2'] );
-        }
-
-        // Decide whether to load the index or edit screen
-        $doaction = ! empty( $_REQUEST['action'] ) ? $_REQUEST['action'] : '';
+        $doaction = bp_admin_list_table_current_bulk_action();
 
         // Call an action for plugins to hook in early