Changeset 6609 for trunk/bp-groups/bp-groups-admin.php

Timestamp:

12/10/2012 02:43:06 PM (13 years ago)

Author:

johnjamesjacoby

Message:

Fix issue with activity and group admin bottom bulk actions not working. Fixes #4547.

File:

• trunk/bp-groups/bp-groups-admin.php (modified) (3 diffs)

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

@@ -57 +57 @@
 
     // Build redirection URL
-    $redirect_to = remove_query_arg( array( 'action', 'gid', 'deleted', 'error', 'updated', 'success_new', 'error_new', 'success_modified', 'error_modified' ), $_SERVER['REQUEST_URI'] );
+    $redirect_to = remove_query_arg( array( 'action', 'action2', 'gid', 'deleted', 'error', 'updated', 'success_new', 'error_new', 'success_modified', 'error_modified' ), $_SERVER['REQUEST_URI'] );
 
     // Decide whether to load the dev version of the CSS and JavaScript
     $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
@@ -544 +550 @@
     }
 
-    $base_url  = remove_query_arg( array( 'action', 'action2', 'paged', 's', '_wpnonce', 'gid' ), $_SERVER['REQUEST_URI'] );
-
-    ?>
+    $base_url  = remove_query_arg( array( 'action', 'action2', 'paged', 's', '_wpnonce', 'gid' ), $_SERVER['REQUEST_URI'] ); ?>
 
     <div class="wrap">
@@ -1088 +1092 @@
 
         if ( empty( $row_class ) ) {
-            $row_class = ( $row_class == '' ) ? ' class="alternate"' : '';
+            $row_class = ' class="alternate"';
+        } else {
+            $row_class = '';
         }