Wordpress 2.8-scripts

[autoinstalls/wordpress.git] / wp-includes / comment.php

diff --git a/wp-includes/comment.php b/wp-includes/comment.php
index 18bf0e196541b858dc3e83841d49006bfb837d50..53e2233dc3c56be4acc1764cfb66c51e19015fb8 100644 (file)
--- a/wp-includes/comment.php
+++ b/wp-includes/comment.php
@@ -168,6 +168,8 @@ function &get_comment(&$comment, $output = OBJECT) {
 /**
  * Retrieve a list of comments.
  *
 /**
  * Retrieve a list of comments.
  *

+ * The comment list can be for the blog as a whole or for an individual post.
+ *

  * The list of comment arguments are 'status', 'orderby', 'comment_date_gmt',
  * 'order', 'number', 'offset', and 'post_id'.
  *
  * The list of comment arguments are 'status', 'orderby', 'comment_date_gmt',
  * 'order', 'number', 'offset', and 'post_id'.
  *


@@ -252,8 +254,10 @@ function get_comments( $args = '' ) {
 function get_comment_statuses( ) {
        $status = array(
                'hold'          => __('Unapproved'),
 function get_comment_statuses( ) {
        $status = array(
                'hold'          => __('Unapproved'),

-               'approve'       => __('Approved'),
-               'spam'          => _c('Spam|adjective'),
+               /* translators: comment status  */
+               'approve'       => _x('Approved', 'adjective'),
+               /* translators: comment status */
+               'spam'          => _x('Spam', 'adjective'),

        );
 
        return $status;
        );
 
        return $status;


@@ -367,14 +371,14 @@ function sanitize_comment_cookies() {
        if ( isset($_COOKIE['comment_author_'.COOKIEHASH]) ) {
                $comment_author = apply_filters('pre_comment_author_name', $_COOKIE['comment_author_'.COOKIEHASH]);
                $comment_author = stripslashes($comment_author);
        if ( isset($_COOKIE['comment_author_'.COOKIEHASH]) ) {
                $comment_author = apply_filters('pre_comment_author_name', $_COOKIE['comment_author_'.COOKIEHASH]);
                $comment_author = stripslashes($comment_author);

-               $comment_author = attribute_escape($comment_author);
+               $comment_author = esc_attr($comment_author);

                $_COOKIE['comment_author_'.COOKIEHASH] = $comment_author;
        }
 
        if ( isset($_COOKIE['comment_author_email_'.COOKIEHASH]) ) {
                $comment_author_email = apply_filters('pre_comment_author_email', $_COOKIE['comment_author_email_'.COOKIEHASH]);
                $comment_author_email = stripslashes($comment_author_email);
                $_COOKIE['comment_author_'.COOKIEHASH] = $comment_author;
        }
 
        if ( isset($_COOKIE['comment_author_email_'.COOKIEHASH]) ) {
                $comment_author_email = apply_filters('pre_comment_author_email', $_COOKIE['comment_author_email_'.COOKIEHASH]);
                $comment_author_email = stripslashes($comment_author_email);

-               $comment_author_email = attribute_escape($comment_author_email);
+               $comment_author_email = esc_attr($comment_author_email);

                $_COOKIE['comment_author_email_'.COOKIEHASH] = $comment_author_email;
        }
 
                $_COOKIE['comment_author_email_'.COOKIEHASH] = $comment_author_email;
        }
 


@@ -408,9 +412,9 @@ function wp_allow_comment($commentdata) {
        $dupe .= ") AND comment_content = '$comment_content' LIMIT 1";
        if ( $wpdb->get_var($dupe) ) {
                if ( defined('DOING_AJAX') )
        $dupe .= ") AND comment_content = '$comment_content' LIMIT 1";
        if ( $wpdb->get_var($dupe) ) {
                if ( defined('DOING_AJAX') )

-                       die( __('Duplicate comment detected; it looks as though you\'ve already said that!') );
+                       die( __('Duplicate comment detected; it looks as though you’ve already said that!') );

 
 

-               wp_die( __('Duplicate comment detected; it looks as though you\'ve already said that!') );
+               wp_die( __('Duplicate comment detected; it looks as though you’ve already said that!') );

        }
 
        do_action( 'check_comment_flood', $comment_author_IP, $comment_author_email, $comment_date_gmt );
        }
 
        do_action( 'check_comment_flood', $comment_author_IP, $comment_author_email, $comment_date_gmt );


@@ -460,8 +464,8 @@ function check_comment_flood_db( $ip, $email, $date ) {
        if ( current_user_can( 'manage_options' ) )
                return; // don't throttle admins
        if ( $lasttime = $wpdb->get_var( $wpdb->prepare("SELECT comment_date_gmt FROM $wpdb->comments WHERE comment_author_IP = %s OR comment_author_email = %s ORDER BY comment_date DESC LIMIT 1", $ip, $email) ) ) {
        if ( current_user_can( 'manage_options' ) )
                return; // don't throttle admins
        if ( $lasttime = $wpdb->get_var( $wpdb->prepare("SELECT comment_date_gmt FROM $wpdb->comments WHERE comment_author_IP = %s OR comment_author_email = %s ORDER BY comment_date DESC LIMIT 1", $ip, $email) ) ) {

-               $time_lastcomment = mysql2date('U', $lasttime);
-               $time_newcomment  = mysql2date('U', $date);
+               $time_lastcomment = mysql2date('U', $lasttime, false);
+               $time_newcomment  = mysql2date('U', $date, false);

                $flood_die = apply_filters('comment_flood_filter', false, $time_lastcomment, $time_newcomment);
                if ( $flood_die ) {
                        do_action('comment_flood_trigger', $time_lastcomment, $time_newcomment);
                $flood_die = apply_filters('comment_flood_filter', false, $time_lastcomment, $time_newcomment);
                if ( $flood_die ) {
                        do_action('comment_flood_trigger', $time_lastcomment, $time_newcomment);


@@ -739,6 +743,13 @@ function wp_delete_comment($comment_id) {
        if ( ! $wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->comments WHERE comment_ID = %d LIMIT 1", $comment_id) ) )
                return false;
 
        if ( ! $wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->comments WHERE comment_ID = %d LIMIT 1", $comment_id) ) )
                return false;
 

+       // Move children up a level.
+       $children = $wpdb->get_col( $wpdb->prepare("SELECT comment_ID FROM $wpdb->comments WHERE comment_parent = %d", $comment_id) );
+       if ( !empty($children) ) {
+               $wpdb->update($wpdb->comments, array('comment_parent' => $comment->comment_parent), array('comment_parent' => $comment_id));
+               clean_comment_cache($children);
+       }
+

        $post_id = $comment->comment_post_ID;
        if ( $post_id && $comment->comment_approved == 1 )
                wp_update_comment_count($post_id);
        $post_id = $comment->comment_post_ID;
        if ( $post_id && $comment->comment_approved == 1 )
                wp_update_comment_count($post_id);


@@ -873,21 +884,24 @@ function wp_insert_comment($commentdata) {
                $comment_parent = 0;
        if ( ! isset($comment_approved) )
                $comment_approved = 1;
                $comment_parent = 0;
        if ( ! isset($comment_approved) )
                $comment_approved = 1;

+       if ( ! isset($comment_karma) )
+               $comment_karma = 0;

        if ( ! isset($user_id) )
                $user_id = 0;
        if ( ! isset($comment_type) )
                $comment_type = '';
 
        if ( ! isset($user_id) )
                $user_id = 0;
        if ( ! isset($comment_type) )
                $comment_type = '';
 

-       $result = $wpdb->query( $wpdb->prepare("INSERT INTO $wpdb->comments
-       (comment_post_ID, comment_author, comment_author_email, comment_author_url, comment_author_IP, comment_date, comment_date_gmt, comment_content, comment_approved, comment_agent, comment_type, comment_parent, user_id)
-       VALUES (%d, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %d, %d)",
-       $comment_post_ID, $comment_author, $comment_author_email, $comment_author_url, $comment_author_IP, $comment_date, $comment_date_gmt, $comment_content, $comment_approved, $comment_agent, $comment_type, $comment_parent, $user_id) );
+       $data = compact('comment_post_ID', 'comment_author', 'comment_author_email', 'comment_author_url', 'comment_author_IP', 'comment_date', 'comment_date_gmt', 'comment_content', 'comment_karma', 'comment_approved', 'comment_agent', 'comment_type', 'comment_parent', 'user_id');
+       $wpdb->insert($wpdb->comments, $data);

 
        $id = (int) $wpdb->insert_id;
 
 
        $id = (int) $wpdb->insert_id;
 

-       if ( $comment_approved == 1)
+       if ( $comment_approved == 1 )

                wp_update_comment_count($comment_post_ID);
 
                wp_update_comment_count($comment_post_ID);
 

+       $comment = get_comment($id);
+       do_action('wp_insert_comment', $id, $comment);
+

        return $id;
 }
 
        return $id;
 }
 


@@ -1009,24 +1023,26 @@ function wp_new_comment( $commentdata ) {
  *
  * @param int $comment_id Comment ID.
  * @param string $comment_status New comment status, either 'hold', 'approve', 'spam', or 'delete'.
  *
  * @param int $comment_id Comment ID.
  * @param string $comment_status New comment status, either 'hold', 'approve', 'spam', or 'delete'.

+ * @param bool $wp_error Whether to return a WP_Error object if there is a failure. Default is false.

  * @return bool False on failure or deletion and true on success.
  */
  * @return bool False on failure or deletion and true on success.
  */

-function wp_set_comment_status($comment_id, $comment_status) {
+function wp_set_comment_status($comment_id, $comment_status, $wp_error = false) {

        global $wpdb;
 
        global $wpdb;
 

+       $status = '0';

        switch ( $comment_status ) {
                case 'hold':
        switch ( $comment_status ) {
                case 'hold':

-                       $query = $wpdb->prepare("UPDATE $wpdb->comments SET comment_approved='0' WHERE comment_ID = %d LIMIT 1", $comment_id);
+                       $status = '0';

                        break;
                case 'approve':
                        break;
                case 'approve':

-                       $query = $wpdb->prepare("UPDATE $wpdb->comments SET comment_approved='1' WHERE comment_ID = %d LIMIT 1", $comment_id);
+                       $status = '1';

                        if ( get_option('comments_notify') ) {
                                $comment = get_comment($comment_id);
                                wp_notify_postauthor($comment_id, $comment->comment_type);
                        }
                        break;
                case 'spam':
                        if ( get_option('comments_notify') ) {
                                $comment = get_comment($comment_id);
                                wp_notify_postauthor($comment_id, $comment->comment_type);
                        }
                        break;
                case 'spam':

-                       $query = $wpdb->prepare("UPDATE $wpdb->comments SET comment_approved='spam' WHERE comment_ID = %d LIMIT 1", $comment_id);
+                       $status = 'spam';

                        break;
                case 'delete':
                        return wp_delete_comment($comment_id);
                        break;
                case 'delete':
                        return wp_delete_comment($comment_id);


@@ -1035,8 +1051,12 @@ function wp_set_comment_status($comment_id, $comment_status) {
                        return false;
        }
 
                        return false;
        }
 

-       if ( !$wpdb->query($query) )
-               return false;
+       if ( !$wpdb->update( $wpdb->comments, array('comment_approved' => $status), array('comment_ID' => $comment_id) ) ) {
+               if ( $wp_error )
+                       return new WP_Error('db_update_error', __('Could not update comment status'), $wpdb->last_error);
+               else
+                       return false;
+       }

 
        clean_comment_cache($comment_id);
 
 
        clean_comment_cache($comment_id);
 


@@ -1069,8 +1089,9 @@ function wp_update_comment($commentarr) {
        $comment = get_comment($commentarr['comment_ID'], ARRAY_A);
 
        // Escape data pulled from DB.
        $comment = get_comment($commentarr['comment_ID'], ARRAY_A);
 
        // Escape data pulled from DB.

-       foreach ( (array) $comment as $key => $value )
-               $comment[$key] = $wpdb->escape($value);
+       $comment = $wpdb->escape($comment);
+
+       $old_status = $comment['comment_approved'];

 
        // Merge old and new fields with new fields overwriting old ones.
        $commentarr = array_merge($comment, $commentarr);
 
        // Merge old and new fields with new fields overwriting old ones.
        $commentarr = array_merge($comment, $commentarr);


@@ -1091,23 +1112,8 @@ function wp_update_comment($commentarr) {
        else if ( 'approve' == $comment_approved )
                $comment_approved = 1;
 
        else if ( 'approve' == $comment_approved )
                $comment_approved = 1;
 

-       $wpdb->query( $wpdb->prepare("UPDATE $wpdb->comments SET
-                       comment_content      = %s,
-                       comment_author       = %s,
-                       comment_author_email = %s,
-                       comment_approved     = %s,
-                       comment_author_url   = %s,
-                       comment_date         = %s,
-                       comment_date_gmt     = %s
-               WHERE comment_ID = %d",
-                       $comment_content,
-                       $comment_author,
-                       $comment_author_email,
-                       $comment_approved,
-                       $comment_author_url,
-                       $comment_date,
-                       $comment_date_gmt,
-                       $comment_ID) );
+       $data = compact('comment_content', 'comment_author', 'comment_author_email', 'comment_approved', 'comment_karma', 'comment_author_url', 'comment_date', 'comment_date_gmt');
+       $wpdb->update($wpdb->comments, $data, compact('comment_ID'));

 
        $rval = $wpdb->rows_affected;
 
 
        $rval = $wpdb->rows_affected;
 


@@ -1115,7 +1121,7 @@ function wp_update_comment($commentarr) {
        wp_update_comment_count($comment_post_ID);
        do_action('edit_comment', $comment_ID);
        $comment = get_comment($comment_ID);
        wp_update_comment_count($comment_post_ID);
        do_action('edit_comment', $comment_ID);
        $comment = get_comment($comment_ID);

-       wp_transition_comment_status($comment_approved, $comment->comment_approved, $comment);
+       wp_transition_comment_status($comment->comment_approved, $old_status, $comment);

        return $rval;
 }
 
        return $rval;
 }
 


@@ -1206,7 +1212,7 @@ function wp_update_comment_count_now($post_id) {
 
        $old = (int) $post->comment_count;
        $new = (int) $wpdb->get_var( $wpdb->prepare("SELECT COUNT(*) FROM $wpdb->comments WHERE comment_post_ID = %d AND comment_approved = '1'", $post_id) );
 
        $old = (int) $post->comment_count;
        $new = (int) $wpdb->get_var( $wpdb->prepare("SELECT COUNT(*) FROM $wpdb->comments WHERE comment_post_ID = %d AND comment_approved = '1'", $post_id) );

-       $wpdb->query( $wpdb->prepare("UPDATE $wpdb->posts SET comment_count = %d WHERE ID = %d", $new, $post_id) );
+       $wpdb->update( $wpdb->posts, array('comment_count' => $new), array('ID' => $post_id) );

 
        if ( 'page' == $post->post_type )
                clean_page_cache( $post_id );
 
        if ( 'page' == $post->post_type )
                clean_page_cache( $post_id );


@@ -1247,7 +1253,12 @@ function discover_pingback_server_uri($url, $deprecated = 2048) {
        if ( ! isset( $parsed_url['host'] ) ) // Not an URL. This should never happen.
                return false;
 
        if ( ! isset( $parsed_url['host'] ) ) // Not an URL. This should never happen.
                return false;
 

-       $response = wp_remote_get( $url, array( 'timeout' => 2, 'httpversion' => '1.1' ) );
+       //Do not search for a pingback server on our own uploads
+       $uploads_dir = wp_upload_dir();
+       if ( 0 === strpos($url, $uploads_dir['baseurl']) )
+               return false;
+
+       $response = wp_remote_head( $url, array( 'timeout' => 2, 'httpversion' => '1.0' ) );

 
        if ( is_wp_error( $response ) )
                return false;
 
        if ( is_wp_error( $response ) )
                return false;


@@ -1259,6 +1270,12 @@ function discover_pingback_server_uri($url, $deprecated = 2048) {
        if ( isset( $response['headers']['content-type'] ) && preg_match('#(image|audio|video|model)/#is', $response['headers']['content-type']) )
                return false;
 
        if ( isset( $response['headers']['content-type'] ) && preg_match('#(image|audio|video|model)/#is', $response['headers']['content-type']) )
                return false;
 

+       // Now do a GET since we're going to look in the html headers (and we're sure its not a binary file)
+       $response = wp_remote_get( $url, array( 'timeout' => 2, 'httpversion' => '1.0' ) );
+
+       if ( is_wp_error( $response ) )
+               return false;
+

        $contents = $response['body'];
 
        $pingback_link_offset_dquote = strpos($contents, $pingback_str_dquote);
        $contents = $response['body'];
 
        $pingback_link_offset_dquote = strpos($contents, $pingback_str_dquote);


@@ -1307,9 +1324,6 @@ function do_all_pings() {
        if ( is_array($trackbacks) )
                foreach ( $trackbacks as $trackback )
                        do_trackbacks($trackback);
        if ( is_array($trackbacks) )
                foreach ( $trackbacks as $trackback )
                        do_trackbacks($trackback);

-
-       //Do Update Services/Generic Pings
-       generic_ping();

 }
 
 /**
 }
 
 /**


@@ -1327,7 +1341,7 @@ function do_trackbacks($post_id) {
        $to_ping = get_to_ping($post_id);
        $pinged  = get_pung($post_id);
        if ( empty($to_ping) ) {
        $to_ping = get_to_ping($post_id);
        $pinged  = get_pung($post_id);
        if ( empty($to_ping) ) {

-               $wpdb->query( $wpdb->prepare("UPDATE $wpdb->posts SET to_ping = '' WHERE ID = %d", $post_id) );
+               $wpdb->update($wpdb->posts, array('to_ping' => ''), array('ID' => $post_id) );

                return;
        }
 
                return;
        }
 


@@ -1542,10 +1556,11 @@ function weblog_ping($server = '', $path = '') {
  * @package WordPress
  * @subpackage Cache
  *
  * @package WordPress
  * @subpackage Cache
  *

- * @param int $id Comment ID to remove from cache
+ * @param int|array $id Comment ID or array of comment IDs to remove from cache

  */
  */

-function clean_comment_cache($id) {
-       wp_cache_delete($id, 'comment');
+function clean_comment_cache($ids) {
+       foreach ( (array) $ids as $id )
+               wp_cache_delete($id, 'comment');

 }
 
 /**
 }
 
 /**