From fce15d1f2caff929a4833efcf0d1b3d1b232d811 Mon Sep 17 00:00:00 2001
From: scribu <scribu@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Fri, 20 Aug 2010 11:43:32 +0000
Subject: [PATCH] Fix the comment type dropdown. Fixes #14637

git-svn-id: http://svn.automattic.com/wordpress/trunk@15513 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/admin-ajax.php                   | 3 ---
 wp-admin/includes/default-list-tables.php | 4 ++--
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/wp-admin/admin-ajax.php b/wp-admin/admin-ajax.php
index 43593d32e..4ef0eb891 100644
--- a/wp-admin/admin-ajax.php
+++ b/wp-admin/admin-ajax.php
@@ -719,8 +719,6 @@ case 'replyto-comment' :
 	$comment = get_comment($comment_id);
 	if ( ! $comment ) die('1');
 
-	$modes = array( 'single', 'detail', 'dashboard' );
-	$mode = isset($_POST['mode']) && in_array( $_POST['mode'], $modes ) ? $_POST['mode'] : 'detail';
 	$position = ( isset($_POST['position']) && (int) $_POST['position']) ? (int) $_POST['position'] : '-1';
 	$checkbox = ( isset($_POST['checkbox']) && true == $_POST['checkbox'] ) ? 1 : 0;
 
@@ -759,7 +757,6 @@ case 'edit-comment' :
 	$_POST['comment_status'] = $_POST['status'];
 	edit_comment();
 
-	$mode = ( isset($_POST['mode']) && 'single' == $_POST['mode'] ) ? 'single' : 'detail';
 	$position = ( isset($_POST['position']) && (int) $_POST['position']) ? (int) $_POST['position'] : '-1';
 	$checkbox = ( isset($_POST['checkbox']) && true == $_POST['checkbox'] ) ? 1 : 0;
 	$comments_listing = isset($_POST['comments_listing']) ? $_POST['comments_listing'] : '';
diff --git a/wp-admin/includes/default-list-tables.php b/wp-admin/includes/default-list-tables.php
index 4627fd93a..0fc31630a 100644
--- a/wp-admin/includes/default-list-tables.php
+++ b/wp-admin/includes/default-list-tables.php
@@ -1984,7 +1984,7 @@ class WP_Comments_Table extends WP_List_Table {
 			'offset' => $start,
 			'number' => $number,
 			'post_id' => $post_id,
-			'plural' => $comment_type,
+			'type' => $comment_type,
 			'orderby' => @$_REQUEST['orderby'],
 			'order' => @$_REQUEST['order'],
 		);
@@ -2043,7 +2043,7 @@ class WP_Comments_Table extends WP_List_Table {
 		if ( 'top' == $which ) {
 ?>
 			<select name="comment_type">
-				<option value="all"><?php _e( 'Show all comment types' ); ?></option>
+				<option value=""><?php _e( 'Show all comment types' ); ?></option>
 <?php
 				$comment_types = apply_filters( 'admin_comment_types_dropdown', array(
 					'comment' => __( 'Comments' ),