golem
/
twentyGOLEM
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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 #14222.



git-svn-id: http://svn.automattic.com/wordpress/trunk@20609 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
nacin 2012-04-26 21:09:51 +00:00
parent d2fbbd1649
commit 45d66d7d62
1 changed files with 19 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
wp-admin/includes/dashboard.php
View File

@ -595,11 +595,6 @@ function wp_dashboard_recent_drafts( $drafts = false ) {
function wp_dashboard_recent_comments() { function wp_dashboard_recent_comments() {
global $wpdb; global $wpdb;
if ( current_user_can('edit_posts') )
$allowed_states = array('0', '1');
else
$allowed_states = array('1');
// Select all comment types and filter out spam later for better query performance. // Select all comment types and filter out spam later for better query performance.
$comments = array(); $comments = array();
$start = 0; $start = 0;
@ -608,44 +603,36 @@ function wp_dashboard_recent_comments() {
$total_items = isset( $widgets['dashboard_recent_comments'] ) && isset( $widgets['dashboard_recent_comments']['items'] ) $total_items = isset( $widgets['dashboard_recent_comments'] ) && isset( $widgets['dashboard_recent_comments']['items'] )
? absint( $widgets['dashboard_recent_comments']['items'] ) : 5; ? absint( $widgets['dashboard_recent_comments']['items'] ) : 5;
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" ) ) { $comments_query = array( 'number' => $total_items * 5, 'offset' => 0 );
if ( ! current_user_can( 'edit_posts' ) )
$comments_query['status'] = 'approve';
while ( count( $comments ) < $total_items && $possible = get_comments( $comments_query ) ) {
foreach ( $possible as $comment ) { foreach ( $possible as $comment ) {
if ( count( $comments ) >= $total_items ) if ( ! current_user_can( 'read_post', $comment->comment_post_ID ) )
break; continue;
if ( in_array( $comment->comment_approved, $allowed_states ) && current_user_can( 'read_post', $comment->comment_post_ID ) ) $comments[] = $comment;
$comments[] = $comment; if ( count( $comments ) == $total_items )
break 2;
} }
$comments_query['offset'] += $comments_query['number'];
$start = $start + 50; $comments_query['number'] = $total_items * 10;
} }
if ( $comments ) : if ( $comments ) {
?> echo '<div id="the-comment-list" class="list:comment">';
<div id="the-comment-list" class="list:comment">
<?php
foreach ( $comments as $comment ) foreach ( $comments as $comment )
_wp_dashboard_recent_comments_row( $comment ); _wp_dashboard_recent_comments_row( $comment );
?> echo '</div>';
</div> if ( current_user_can('edit_posts') )
_get_list_table('WP_Comments_List_Table')->views();
<?php
if ( current_user_can('edit_posts') ) { ?>
<?php _get_list_table('WP_Comments_List_Table')->views(); ?>
<?php }
wp_comment_reply( -1, false, 'dashboard', false ); wp_comment_reply( -1, false, 'dashboard', false );
wp_comment_trashnotice(); wp_comment_trashnotice();
} else {
else : echo '<p>' . __( 'No comments yet.' ) . '</p>';
?> }
<p><?php _e( 'No comments yet.' ); ?></p>
<?php
endif; // $comments;
} }
function _wp_dashboard_recent_comments_row( &$comment, $show_date = true ) { function _wp_dashboard_recent_comments_row( &$comment, $show_date = true ) {