<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[15513] trunk/wp-admin: Fix the comment type dropdown.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15513">15513</a></dd>
<dt>Author</dt> <dd>scribu</dd>
<dt>Date</dt> <dd>2010-08-20 11:43:32 +0000 (Fri, 20 Aug 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix the comment type dropdown. Fixes <a href="http://trac.wordpress.org/ticket/14637">#14637</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminadminajaxphp">trunk/wp-admin/admin-ajax.php</a></li>
<li><a href="#trunkwpadminincludesdefaultlisttablesphp">trunk/wp-admin/includes/default-list-tables.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminadminajaxphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/admin-ajax.php (15512 => 15513)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/admin-ajax.php 2010-08-20 11:18:41 UTC (rev 15512)
+++ trunk/wp-admin/admin-ajax.php 2010-08-20 11:43:32 UTC (rev 15513)
</span><span class="lines">@@ -719,8 +719,6 @@
</span><span class="cx"> $comment = get_comment($comment_id);
</span><span class="cx"> if ( ! $comment ) die('1');
</span><span class="cx">
</span><del>- $modes = array( 'single', 'detail', 'dashboard' );
- $mode = isset($_POST['mode']) && in_array( $_POST['mode'], $modes ) ? $_POST['mode'] : 'detail';
</del><span class="cx"> $position = ( isset($_POST['position']) && (int) $_POST['position']) ? (int) $_POST['position'] : '-1';
</span><span class="cx"> $checkbox = ( isset($_POST['checkbox']) && true == $_POST['checkbox'] ) ? 1 : 0;
</span><span class="cx">
</span><span class="lines">@@ -759,7 +757,6 @@
</span><span class="cx"> $_POST['comment_status'] = $_POST['status'];
</span><span class="cx"> edit_comment();
</span><span class="cx">
</span><del>- $mode = ( isset($_POST['mode']) && 'single' == $_POST['mode'] ) ? 'single' : 'detail';
</del><span class="cx"> $position = ( isset($_POST['position']) && (int) $_POST['position']) ? (int) $_POST['position'] : '-1';
</span><span class="cx"> $checkbox = ( isset($_POST['checkbox']) && true == $_POST['checkbox'] ) ? 1 : 0;
</span><span class="cx"> $comments_listing = isset($_POST['comments_listing']) ? $_POST['comments_listing'] : '';
</span></span></pre></div>
<a id="trunkwpadminincludesdefaultlisttablesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/default-list-tables.php (15512 => 15513)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/default-list-tables.php 2010-08-20 11:18:41 UTC (rev 15512)
+++ trunk/wp-admin/includes/default-list-tables.php 2010-08-20 11:43:32 UTC (rev 15513)
</span><span class="lines">@@ -1984,7 +1984,7 @@
</span><span class="cx"> 'offset' => $start,
</span><span class="cx"> 'number' => $number,
</span><span class="cx"> 'post_id' => $post_id,
</span><del>- 'plural' => $comment_type,
</del><ins>+ 'type' => $comment_type,
</ins><span class="cx"> 'orderby' => @$_REQUEST['orderby'],
</span><span class="cx"> 'order' => @$_REQUEST['order'],
</span><span class="cx"> );
</span><span class="lines">@@ -2043,7 +2043,7 @@
</span><span class="cx"> if ( 'top' == $which ) {
</span><span class="cx"> ?>
</span><span class="cx"> <select name="comment_type">
</span><del>- <option value="all"><?php _e( 'Show all comment types' ); ?></option>
</del><ins>+ <option value=""><?php _e( 'Show all comment types' ); ?></option>
</ins><span class="cx"> <?php
</span><span class="cx"> $comment_types = apply_filters( 'admin_comment_types_dropdown', array(
</span><span class="cx"> 'comment' => __( 'Comments' ),
</span></span></pre>
</div>
</div>
</body>
</html>