Changeset 12461

Timestamp:

12/19/2009 11:30:54 AM (15 years ago)

Author:

westi

Message:

Ensure that bulk comment actions do not remove spaces from search terms.
Also refactors comment bulk action redirect url building to be consistent with other operations.
Fixes #11471 props nacin.

File:

• trunk/wp-admin/edit-comments.php (modified) (3 diffs)

trunk/wp-admin/edit-comments.php

@@ -33 +33 @@
         $doaction = $_REQUEST['action'];
     } else {
-        wp_redirect($_SERVER['HTTP_REFERER']);
+        wp_redirect( wp_get_referer() );
     }
 
     $approved = $unapproved = $spammed = $unspammed = $trashed = $untrashed = $deleted = 0;
+    $redirect_to = remove_query_arg( array('trashed', 'untrashed', 'deleted', 'spammed', 'unspammed', 'approved', 'unapproved', 'ids'), wp_get_referer() );
 
     foreach ($comment_ids as $comment_id) { // Check the permissions on each
@@ -75 +76 @@
         }
     }
-
-    $redirect_to = 'edit-comments.php';
 
     if ( $approved )
@@ -95 +94 @@
         $redirect_to = add_query_arg( 'ids', join(',', $comment_ids), $redirect_to );
 
-    if ( $post_id )
-        $redirect_to = add_query_arg( 'p', absint( $post_id ), $redirect_to );
-    if ( isset($_REQUEST['apage']) )
-        $redirect_to = add_query_arg( 'apage', absint($_REQUEST['apage']), $redirect_to );
-    if ( !empty($_REQUEST['mode']) )
-        $redirect_to = add_query_arg('mode', $_REQUEST['mode'], $redirect_to);
-    if ( !empty($_REQUEST['comment_status']) )
-        $redirect_to = add_query_arg('comment_status', $_REQUEST['comment_status'], $redirect_to);
-    if ( !empty($_REQUEST['s']) )
-        $redirect_to = add_query_arg('s', $_REQUEST['s'], $redirect_to);
     wp_redirect( $redirect_to );
+    exit;
 } elseif ( isset($_GET['_wp_http_referer']) && ! empty($_GET['_wp_http_referer']) ) {
      wp_redirect( remove_query_arg( array('_wp_http_referer', '_wpnonce'), stripslashes($_SERVER['REQUEST_URI']) ) );