<!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" />
<title>[20609] trunk/wp-admin/includes/dashboard.php: Make the Recent Comments dashboard widget more performant on sites with large amounts of comments, in particular with a heavy spam ratio.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/20609">20609</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2012-04-26 21:09:51 +0000 (Thu, 26 Apr 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make the Recent Comments dashboard widget more performant on sites with large amounts of comments, in particular with a heavy spam ratio.
Simplifies the query by avoiding a join, and leverages the API now rather than a direct query.
fixes <a href="http://core.trac.wordpress.org/ticket/14222">#14222</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesdashboardphp">trunk/wp-admin/includes/dashboard.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesdashboardphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/dashboard.php (20608 => 20609)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/dashboard.php 2012-04-26 20:56:52 UTC (rev 20608)
+++ trunk/wp-admin/includes/dashboard.php 2012-04-26 21:09:51 UTC (rev 20609)
</span><span class="lines">@@ -595,11 +595,6 @@
</span><span class="cx"> function wp_dashboard_recent_comments() {
</span><span class="cx"> global $wpdb;
</span><span class="cx">
</span><del>- if ( current_user_can('edit_posts') )
- $allowed_states = array('0', '1');
- else
- $allowed_states = array('1');
-
</del><span class="cx"> // Select all comment types and filter out spam later for better query performance.
</span><span class="cx"> $comments = array();
</span><span class="cx"> $start = 0;
</span><span class="lines">@@ -608,44 +603,36 @@
</span><span class="cx"> $total_items = isset( $widgets['dashboard_recent_comments'] ) && isset( $widgets['dashboard_recent_comments']['items'] )
</span><span class="cx"> ? absint( $widgets['dashboard_recent_comments']['items'] ) : 5;
</span><span class="cx">
</span><del>- while ( count( $comments ) < $total_items && $possible = $wpdb->get_results( "SELECT * FROM $wpdb->comments c LEFT JOIN $wpdb->posts p ON c.comment_post_ID = p.ID WHERE p.post_status != 'trash' ORDER BY c.comment_date_gmt DESC LIMIT $start, 50" ) ) {
</del><ins>+ $comments_query = array( 'number' => $total_items * 5, 'offset' => 0 );
+ if ( ! current_user_can( 'edit_posts' ) )
+ $comments_query['status'] = 'approve';
</ins><span class="cx">
</span><ins>+ while ( count( $comments ) < $total_items && $possible = get_comments( $comments_query ) ) {
</ins><span class="cx"> foreach ( $possible as $comment ) {
</span><del>- if ( count( $comments ) >= $total_items )
- break;
- if ( in_array( $comment->comment_approved, $allowed_states ) && current_user_can( 'read_post', $comment->comment_post_ID ) )
- $comments[] = $comment;
</del><ins>+ if ( ! current_user_can( 'read_post', $comment->comment_post_ID ) )
+ continue;
+ $comments[] = $comment;
+ if ( count( $comments ) == $total_items )
+ break 2;
</ins><span class="cx"> }
</span><del>-
- $start = $start + 50;
</del><ins>+ $comments_query['offset'] += $comments_query['number'];
+ $comments_query['number'] = $total_items * 10;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- if ( $comments ) :
-?>
-
- <div id="the-comment-list" class="list:comment">
-<?php
</del><ins>+ if ( $comments ) {
+ echo '<div id="the-comment-list" class="list:comment">';
</ins><span class="cx"> foreach ( $comments as $comment )
</span><span class="cx"> _wp_dashboard_recent_comments_row( $comment );
</span><del>-?>
</del><ins>+ echo '</div>';
</ins><span class="cx">
</span><del>- </div>
</del><ins>+ if ( current_user_can('edit_posts') )
+ _get_list_table('WP_Comments_List_Table')->views();
</ins><span class="cx">
</span><del>-<?php
- if ( current_user_can('edit_posts') ) { ?>
- <?php _get_list_table('WP_Comments_List_Table')->views(); ?>
-<?php }
-
</del><span class="cx"> wp_comment_reply( -1, false, 'dashboard', false );
</span><span class="cx"> wp_comment_trashnotice();
</span><del>-
- else :
-?>
-
- <p><?php _e( 'No comments yet.' ); ?></p>
-
-<?php
- endif; // $comments;
</del><ins>+ } else {
+ echo '<p>' . __( 'No comments yet.' ) . '</p>';
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function _wp_dashboard_recent_comments_row( &$comment, $show_date = true ) {
</span></span></pre>
</div>
</div>
</body>
</html>