Ticket #14841: edit-comments.diff

wp-admin/edit-comments.php

@@ -15 +15 @@
 wp_enqueue_script('admin-comments');
 enqueue_comment_hotkeys_js();
 
+$search_dirty = ( isset($_GET['s']) ) ? $_GET['s'] : '';
+$search = esc_attr( $search_dirty );
+
+// Comments search is global, so if this is a search remove the post id
+if ( !empty($search_dirty) ) {
+        $_SERVER['REQUEST_URI'] = remove_query_arg('p', $_SERVER['REQUEST_URI']);
+        unset($_REQUEST['p']);
+}
+
 $post_id = isset($_REQUEST['p']) ? (int) $_REQUEST['p'] : 0;
 
 if ( isset($_REQUEST['doaction']) ||  isset($_REQUEST['doaction2']) || isset($_REQUEST['delete_all']) || isset($_REQUEST['delete_all2']) ) {
@@ -100 +109 @@
          exit;
 }
 
-if ( $post_id )
+if ( $post_id && empty($search_dirty) )
         $title = sprintf(__('Comments on “%s”'), wp_html_excerpt(_draft_or_post_title($post_id), 50));
 else
         $title = __('Comments');
@@ -127 +136 @@
 
 $comment_type = !empty($_GET['comment_type']) ? esc_attr($_GET['comment_type']) : '';
 
-$search_dirty = ( isset($_GET['s']) ) ? $_GET['s'] : '';
-$search = esc_attr( $search_dirty ); ?>
+?>
 
 <div class="wrap">
 <?php screen_icon(); ?>
@@ -243 +251 @@
                 $translated_label = _nx( $label[0], $label[1], $num_comments->$status, $label[2] );
         else
                 $translated_label = _n( $label[0], $label[1], $num_comments->$status );
-        $status_links[] = "<li class='$status'><a href='$link'$class>" . sprintf( 
+        $status_links[] = "<li class='$status'><a href='$link'$class>" . sprintf(
                 $translated_label,
                 number_format_i18n( $num_comments->$status )
         ) . '</a>';