Ticket #6992: 6992.3.diff
File 6992.3.diff, 2.3 KB (added by , 16 years ago) |
---|
-
wp-includes/comment.php
367 367 */ 368 368 function sanitize_comment_cookies() { 369 369 if ( isset($_COOKIE['comment_author_'.COOKIEHASH]) ) { 370 $_COOKIE['comment_author_raw_'.COOKIEHASH] = $_COOKIE['comment_author_'.COOKIEHASH]; 370 371 $comment_author = apply_filters('pre_comment_author_name', $_COOKIE['comment_author_'.COOKIEHASH]); 371 372 $comment_author = stripslashes($comment_author); 372 373 $comment_author = attr($comment_author); … … 374 375 } 375 376 376 377 if ( isset($_COOKIE['comment_author_email_'.COOKIEHASH]) ) { 378 $_COOKIE['comment_author_email_raw_'.COOKIEHASH] = $_COOKIE['comment_author_email_'.COOKIEHASH]; 377 379 $comment_author_email = apply_filters('pre_comment_author_email', $_COOKIE['comment_author_email_'.COOKIEHASH]); 378 380 $comment_author_email = stripslashes($comment_author_email); 379 381 $comment_author_email = attr($comment_author_email); -
wp-includes/comment-template.php
824 824 } else if ( empty($comment_author) ) { 825 825 $comments = get_comments( array('post_id' => $post->ID, 'status' => 'approve', 'order' => 'ASC') ); 826 826 } else { 827 $comments = $wpdb->get_results($wpdb->prepare("SELECT * FROM $wpdb->comments WHERE comment_post_ID = %d AND ( comment_approved = '1' OR ( comment_author = %s AND comment_author_email = %s AND comment_approved = '0' ) ) ORDER BY comment_date_gmt", $post->ID, $comment_author, $comment_author_email)); 827 $comment_author_sql = !empty($_COOKIE['comment_author_raw_'.COOKIEHASH]) ? stripslashes($_COOKIE['comment_author_raw_'.COOKIEHASH]) : $comment_author; 828 $comment_author_email_sql = !empty($_COOKIE['comment_author_email_raw_'.COOKIEHASH]) ? stripslashes($_COOKIE['comment_author_email_raw_'.COOKIEHASH]) : $comment_author_email; 829 $comments = $wpdb->get_results($wpdb->prepare("SELECT * FROM $wpdb->comments WHERE comment_post_ID = %d AND ( comment_approved = '1' OR ( comment_author = %s AND comment_author_email = %s AND comment_approved = '0' ) ) ORDER BY comment_date_gmt", $post->ID, $comment_author_sql, $comment_author_email_sql)); 828 830 } 829 831 830 832 // keep $comments for legacy's sake