<!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>[15504] trunk/wp-admin: introduce WP_List_Table::comments_bubble();
revert to edit-comments.php?p=123.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15504">15504</a></dd>
<dt>Author</dt> <dd>scribu</dd>
<dt>Date</dt> <dd>2010-08-18 16:30:27 +0000 (Wed, 18 Aug 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>introduce WP_List_Table::comments_bubble(); revert to edit-comments.php?p=123. See <a href="http://trac.wordpress.org/ticket/14579">#14579</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadmineditcommentsphp">trunk/wp-admin/edit-comments.php</a></li>
<li><a href="#trunkwpadminincludesdefaultlisttablesphp">trunk/wp-admin/includes/default-list-tables.php</a></li>
<li><a href="#trunkwpadminincludeslisttablephp">trunk/wp-admin/includes/list-table.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadmineditcommentsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit-comments.php (15503 => 15504)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit-comments.php 2010-08-18 06:50:53 UTC (rev 15503)
+++ trunk/wp-admin/edit-comments.php 2010-08-18 16:30:27 UTC (rev 15504)
</span><span class="lines">@@ -225,7 +225,7 @@
</span><span class="cx"> $num_comments->$status = 10;
</span><span class="cx"> $link = add_query_arg( 'comment_status', $status, $link );
</span><span class="cx"> if ( $post_id )
</span><del>- $link = add_query_arg( 'post_ID', absint( $post_id ), $link );
</del><ins>+ $link = add_query_arg( 'p', absint( $post_id ), $link );
</ins><span class="cx"> /*
</span><span class="cx"> // I toyed with this, but decided against it. Leaving it in here in case anyone thinks it is a good idea. ~ Mark
</span><span class="cx"> if ( !empty( $_REQUEST['s'] ) )
</span><span class="lines">@@ -252,7 +252,7 @@
</span><span class="cx">
</span><span class="cx"> <input type="hidden" name="mode" value="<?php echo esc_attr($mode); ?>" />
</span><span class="cx"> <?php if ( $post_id ) : ?>
</span><del>-<input type="hidden" name="post_ID" value="<?php echo esc_attr( intval( $post_id ) ); ?>" />
</del><ins>+<input type="hidden" name="p" value="<?php echo esc_attr( intval( $post_id ) ); ?>" />
</ins><span class="cx"> <?php endif; ?>
</span><span class="cx"> <input type="hidden" name="comment_status" value="<?php echo esc_attr($comment_status); ?>" />
</span><span class="cx"> <input type="hidden" name="pagegen_timestamp" value="<?php echo esc_attr(current_time('mysql', 1)); ?>" />
</span><span class="lines">@@ -280,7 +280,7 @@
</span><span class="cx"> <input type="hidden" name="comment_status" value="<?php echo esc_attr($comment_status); ?>" />
</span><span class="cx"> <input type="hidden" name="page" value="<?php echo esc_attr($page); ?>" />
</span><span class="cx"> <input type="hidden" name="per_page" value="<?php echo esc_attr($comments_per_page); ?>" />
</span><del>- <input type="hidden" name="post_ID" value="<?php echo esc_attr( $post_id ); ?>" />
</del><ins>+ <input type="hidden" name="p" value="<?php echo esc_attr( $post_id ); ?>" />
</ins><span class="cx"> <input type="hidden" name="comment_type" value="<?php echo esc_attr( $comment_type ); ?>" />
</span><span class="cx"> <?php wp_nonce_field( 'add-comment', '_ajax_nonce', false ); ?>
</span><span class="cx"> </form>
</span></span></pre></div>
<a id="trunkwpadminincludesdefaultlisttablesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/default-list-tables.php (15503 => 15504)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/default-list-tables.php 2010-08-18 06:50:53 UTC (rev 15503)
+++ trunk/wp-admin/includes/default-list-tables.php 2010-08-18 16:30:27 UTC (rev 15504)
</span><span class="lines">@@ -555,19 +555,8 @@
</span><span class="cx"> <td <?php echo $attributes ?>><div class="post-com-count-wrapper">
</span><span class="cx"> <?php
</span><span class="cx"> $pending_comments = isset( $this->comment_pending_count[$post->ID] ) ? $this->comment_pending_count[$post->ID] : 0;
</span><del>- $pending_phrase = sprintf( __( '%s pending' ), number_format( $pending_comments ) );
- if ( $pending_comments )
- echo '<strong>';
- comments_number(
- "<a href='edit-comments.php?post_ID=$post->ID' title='$pending_phrase' class='post-com-count'><span class='comment-count'>"
- . /* translators: comment count link */ _x( '0', 'comment count' ) . '</span></a>',
- "<a href='edit-comments.php?post_ID=$post->ID' title='$pending_phrase' class='post-com-count'><span class='comment-count'>"
- . /* translators: comment count link */ _x( '1', 'comment count' ) . '</span></a>',
- "<a href='edit-comments.php?post_ID=$post->ID' title='$pending_phrase' class='post-com-count'><span class='comment-count'>"
- . /* translators: comment count link: % will be substituted by comment count */ _x( '%', 'comment count' ) . '</span></a>'
- );
- if ( $pending_comments )
- echo '</strong>';
</del><ins>+
+ $this->comments_bubble( $post->ID, $pending_comments );
</ins><span class="cx"> ?>
</span><span class="cx"> </div></td>
</span><span class="cx"> <?php
</span><span class="lines">@@ -1216,21 +1205,10 @@
</span><span class="cx"> <td <?php echo $attributes ?>>
</span><span class="cx"> <div class="post-com-count-wrapper">
</span><span class="cx"> <?php
</span><del>- $left = get_pending_comments_num( $post->ID );
- $pending_phrase = sprintf( __( '%s pending' ), number_format( $left ) );
- if ( $left )
- echo '<strong>';
- comments_number(
- "<a href='edit-comments.php?post_ID=$id' title='$pending_phrase' class='post-com-count'><span class='comment-count'>"
- . /* translators: comment count link */ _x( '0', 'comment count' ) . '</span></a>',
- "<a href='edit-comments.php?post_ID=$id' title='$pending_phrase' class='post-com-count'><span class='comment-count'>"
- . /* translators: comment count link */ _x( '1', 'comment count' ) . '</span></a>',
- "<a href='edit-comments.php?post_ID=$id' title='$pending_phrase' class='post-com-count'><span class='comment-count'>"
- . /* translators: comment count link: % will be substituted by comment count */ _x( '%', 'comment count' ) . '</span></a>'
- );
- if ( $left )
- echo '</strong>';
- ?>
</del><ins>+ $pending_comments = get_pending_comments_num( $post->ID );
+
+ $this->comments_bubble( $post->ID, $pending_comments );
+?>
</ins><span class="cx"> </div>
</span><span class="cx"> </td>
</span><span class="cx"> <?php
</span><span class="lines">@@ -1965,7 +1943,7 @@
</span><span class="cx"> function prepare_items() {
</span><span class="cx"> global $post_id, $comment_status, $mode;
</span><span class="cx">
</span><del>- $post_id = isset( $_REQUEST['post_ID'] ) ? absint( $_REQUEST['post_ID'] ) : 0;
</del><ins>+ $post_id = isset( $_REQUEST['p'] ) ? absint( $_REQUEST['p'] ) : 0;
</ins><span class="cx">
</span><span class="cx"> $mode = ( empty( $_REQUEST['mode'] ) ) ? 'detail' : $_REQUEST['mode'];
</span><span class="cx">
</span><span class="lines">@@ -2338,19 +2316,7 @@
</span><span class="cx"> echo "<td $attributes>\n";
</span><span class="cx"> echo '<div class="response-links"><span class="post-com-count-wrapper">';
</span><span class="cx"> echo $post_link . '<br />';
</span><del>- $pending_phrase = esc_attr( sprintf( __( '%s pending' ), number_format( $pending_comments ) ) );
- if ( $pending_comments )
- echo '<strong>';
- comments_number(
- "<a href='edit-comments.php?post_ID=$post->ID' title='$pending_phrase' class='post-com-count'><span class='comment-count'>"
- . /* translators: comment count link */ _x( '0', 'comment count' ) . '</span></a>',
- "<a href='edit-comments.php?post_ID=$post->ID' title='$pending_phrase' class='post-com-count'><span class='comment-count'>"
- . /* translators: comment count link */ _x( '1', 'comment count' ) . '</span></a>',
- "<a href='edit-comments.php?post_ID=$post->ID' title='$pending_phrase' class='post-com-count'><span class='comment-count'>"
- . /* translators: comment count link: % will be substituted by comment count */ _x( '%', 'comment count' ) . '</span></a>'
- );
- if ( $pending_comments )
- echo '</strong>';
</del><ins>+ $this->comments_bubble( $post->ID, $pending_comments );
</ins><span class="cx"> echo '</span> ';
</span><span class="cx"> echo "<a href='" . get_permalink( $post->ID ) . "'>#</a>";
</span><span class="cx"> echo '</div>';
</span></span></pre></div>
<a id="trunkwpadminincludeslisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/list-table.php (15503 => 15504)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/list-table.php 2010-08-18 06:50:53 UTC (rev 15503)
+++ trunk/wp-admin/includes/list-table.php 2010-08-18 16:30:27 UTC (rev 15504)
</span><span class="lines">@@ -268,6 +268,33 @@
</span><span class="cx"> <?php
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ /** Display a comment count bubble
+ *
+ *
+ * @since 3.1.0
+ * @access protected
+ *
+ * @param int $post_id
+ * @param int $pending_comments
+ */
+ function comments_bubble( $post_id, $pending_comments ) {
+ $pending_phrase = sprintf( __( '%s pending' ), number_format( $pending_comments ) );
+
+ if ( $pending_comments )
+ echo '<strong>';
+
+ $link = "<a href='edit-comments.php?p=$post->ID' title='$pending_phrase' class='post-com-count'><span class='comment-count'>%s</span></a>";
+
+ comments_number(
+ sprintf( $link, /* translators: comment count link */ _x( '0', 'comment count' ) ),
+ sprintf( $link, /* translators: comment count link */ _x( '1', 'comment count' ) ),
+ sprintf( $link, /* translators: comment count link: % will be substituted by comment count */ _x( '%', 'comment count' ) )
+ );
+
+ if ( $pending_comments )
+ echo '</strong>';
+ }
+
</ins><span class="cx"> /**
</span><span class="cx"> * Get the current page number
</span><span class="cx"> *
</span></span></pre>
</div>
</div>
</body>
</html>