Fix the comment type dropdown. Fixes #14637

git-svn-id: http://svn.automattic.com/wordpress/trunk@15513 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
scribu 2010-08-20 11:43:32 +00:00
parent 1b2fa98e2a
commit fce15d1f2c
2 changed files with 2 additions and 5 deletions

View File

@ -719,8 +719,6 @@ case 'replyto-comment' :
$comment = get_comment($comment_id); $comment = get_comment($comment_id);
if ( ! $comment ) die('1'); 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'; $position = ( isset($_POST['position']) && (int) $_POST['position']) ? (int) $_POST['position'] : '-1';
$checkbox = ( isset($_POST['checkbox']) && true == $_POST['checkbox'] ) ? 1 : 0; $checkbox = ( isset($_POST['checkbox']) && true == $_POST['checkbox'] ) ? 1 : 0;
@ -759,7 +757,6 @@ case 'edit-comment' :
$_POST['comment_status'] = $_POST['status']; $_POST['comment_status'] = $_POST['status'];
edit_comment(); edit_comment();
$mode = ( isset($_POST['mode']) && 'single' == $_POST['mode'] ) ? 'single' : 'detail';
$position = ( isset($_POST['position']) && (int) $_POST['position']) ? (int) $_POST['position'] : '-1'; $position = ( isset($_POST['position']) && (int) $_POST['position']) ? (int) $_POST['position'] : '-1';
$checkbox = ( isset($_POST['checkbox']) && true == $_POST['checkbox'] ) ? 1 : 0; $checkbox = ( isset($_POST['checkbox']) && true == $_POST['checkbox'] ) ? 1 : 0;
$comments_listing = isset($_POST['comments_listing']) ? $_POST['comments_listing'] : ''; $comments_listing = isset($_POST['comments_listing']) ? $_POST['comments_listing'] : '';

View File

@ -1984,7 +1984,7 @@ class WP_Comments_Table extends WP_List_Table {
'offset' => $start, 'offset' => $start,
'number' => $number, 'number' => $number,
'post_id' => $post_id, 'post_id' => $post_id,
'plural' => $comment_type, 'type' => $comment_type,
'orderby' => @$_REQUEST['orderby'], 'orderby' => @$_REQUEST['orderby'],
'order' => @$_REQUEST['order'], 'order' => @$_REQUEST['order'],
); );
@ -2043,7 +2043,7 @@ class WP_Comments_Table extends WP_List_Table {
if ( 'top' == $which ) { if ( 'top' == $which ) {
?> ?>
<select name="comment_type"> <select name="comment_type">
<option value="all"><?php _e( 'Show all comment types' ); ?></option> <option value=""><?php _e( 'Show all comment types' ); ?></option>
<?php <?php
$comment_types = apply_filters( 'admin_comment_types_dropdown', array( $comment_types = apply_filters( 'admin_comment_types_dropdown', array(
'comment' => __( 'Comments' ), 'comment' => __( 'Comments' ),