WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove comment_count_cache. fixes #2670 

git-svn-id: http://svn.automattic.com/wordpress/trunk@3716 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2006-04-19 02:53:02 +00:00
parent ffe09c30c7
commit 78e9a489f2
2 changed files with 41 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
wp-includes/comment-template.php
View File

@ -142,17 +142,19 @@ function comments_link( $file = '', $echo = true ) {
} }
function get_comments_number( $post_id = 0 ) { function get_comments_number( $post_id = 0 ) {
global $wpdb, $comment_count_cache, $id; global $wpdb, $id;
$post_id = (int) $post_id; $post_id = (int) $post_id;
if ( !$post_id ) if ( !$post_id )
$post_id = $id; $post_id = $id;
// TODO: Remove SELECT. Use get_post(). $post = get_post($post_id);
if ( !isset($comment_count_cache[$post_id]) ) if ( ! isset($post->comment_count) )
$comment_count_cache[$id] = $wpdb->get_var("SELECT comment_count FROM $wpdb->posts WHERE ID = '$post_id'"); $count = 0;
else
$count = $post->comment_count;
return apply_filters('get_comments_number', $comment_count_cache[$post_id]); return apply_filters('get_comments_number', $count);
} }
function comments_number( $zero = 'No Comments', $one = '1 Comment', $more = '% Comments', $number = '' ) { function comments_number( $zero = 'No Comments', $one = '1 Comment', $more = '% Comments', $number = '' ) {
@ -323,48 +325,46 @@ function comments_popup_script($width=400, $height=400, $file='') {
function comments_popup_link($zero='No Comments', $one='1 Comment', $more='% Comments', $CSSclass='', $none='Comments Off') { function comments_popup_link($zero='No Comments', $one='1 Comment', $more='% Comments', $CSSclass='', $none='Comments Off') {
global $id, $wpcommentspopupfile, $wpcommentsjavascript, $post, $wpdb; global $id, $wpcommentspopupfile, $wpcommentsjavascript, $post, $wpdb;
global $comment_count_cache;
if (! is_single() && ! is_page()) { if ( is_single() || is_page() )
// TODO: Use API instead of SELECT return;
if ( !isset($comment_count_cache[$id]) )
$comment_count_cache[$id] = $wpdb->get_var("SELECT COUNT(comment_ID) FROM $wpdb->comments WHERE comment_post_ID = $id AND comment_approved = '1';");
$number = $comment_count_cache[$id]; $number = get_comments_number($id);
if (0 == $number && 'closed' == $post->comment_status && 'closed' == $post->ping_status) { if ( 0 == $number && 'closed' == $post->comment_status && 'closed' == $post->ping_status ) {
echo $none; echo $none;
return; return;
} else {
if (!empty($post->post_password)) { // if there's a password
if ($_COOKIE['wp-postpass_'.COOKIEHASH] != $post->post_password) { // and it doesn't match the cookie
echo(__('Enter your password to view comments'));
return;
}
}
echo '<a href="';
if ($wpcommentsjavascript) {
if ( empty($wpcommentspopupfile) )
$home = get_settings('home');
else
$home = get_settings('siteurl');
echo $home . '/' . $wpcommentspopupfile.'?comments_popup='.$id;
echo '" onclick="wpopen(this.href); return false"';
} else { // if comments_popup_script() is not in the template, display simple comment link
if ( 0 == $number )
echo get_permalink() . '#respond';
else
comments_link();
echo '"';
}
if (!empty($CSSclass)) {
echo ' class="'.$CSSclass.'"';
}
echo ' title="' . sprintf( __('Comment on %s'), $post->post_title ) .'">';
comments_number($zero, $one, $more, $number);
echo '</a>';
} }
if ( !empty($post->post_password) ) { // if there's a password
if ($_COOKIE['wp-postpass_'.COOKIEHASH] != $post->post_password) { // and it doesn't match the cookie
echo(__('Enter your password to view comments'));
return;
}
} }
echo '<a href="';
if ($wpcommentsjavascript) {
if ( empty($wpcommentspopupfile) )
$home = get_settings('home');
else
$home = get_settings('siteurl');
echo $home . '/' . $wpcommentspopupfile.'?comments_popup='.$id;
echo '" onclick="wpopen(this.href); return false"';
} else { // if comments_popup_script() is not in the template, display simple comment link
if ( 0 == $number )
echo get_permalink() . '#respond';
else
comments_link();
echo '"';
}
if (!empty($CSSclass)) {
echo ' class="'.$CSSclass.'"';
}
echo ' title="' . sprintf( __('Comment on %s'), $post->post_title ) .'">';
comments_number($zero, $one, $more, $number);
echo '</a>';
} }
?> ?>

3
wp-includes/functions.php
View File

@ -1313,7 +1313,7 @@ function update_post_category_cache($post_ids) {
} }
function update_post_caches(&$posts) { function update_post_caches(&$posts) {
global $post_cache, $category_cache, $comment_count_cache, $post_meta_cache; global $post_cache, $category_cache, $post_meta_cache;
global $wpdb; global $wpdb;
// No point in doing all this work if we didn't match any posts. // No point in doing all this work if we didn't match any posts.
@ -1324,7 +1324,6 @@ function update_post_caches(&$posts) {
for ($i = 0; $i < count($posts); $i++) { for ($i = 0; $i < count($posts); $i++) {
$post_id_array[] = $posts[$i]->ID; $post_id_array[] = $posts[$i]->ID;
$post_cache[$posts[$i]->ID] = &$posts[$i]; $post_cache[$posts[$i]->ID] = &$posts[$i];
$comment_count_cache[$posts[$i]->ID] = $posts[$i]->comment_count;
} }
$post_id_list = implode(',', $post_id_array); $post_id_list = implode(',', $post_id_array);