Wordpress 3.5.2

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

diff --git a/wp-includes/comment.php b/wp-includes/comment.php
index c0c17566102f750ab90ea4d2905b532f907bac1f..5476b930c7e098fe72748acf684f32cfd40b2246 100644 (file)
--- a/wp-includes/comment.php
+++ b/wp-includes/comment.php
@@ -127,7 +127,7 @@ function get_approved_comments($post_id) {
  * @param string $output Optional. OBJECT or ARRAY_A or ARRAY_N constants.
  * @return object|array|null Depends on $output value.
  */
  * @param string $output Optional. OBJECT or ARRAY_A or ARRAY_N constants.
  * @return object|array|null Depends on $output value.
  */

-function &get_comment(&$comment, $output = OBJECT) {
+function get_comment(&$comment, $output = OBJECT) {

        global $wpdb;
        $null = null;
 
        global $wpdb;
        $null = null;
 


@@ -190,6 +190,14 @@ function get_comments( $args = '' ) {
  * @since 3.1.0
  */
 class WP_Comment_Query {
  * @since 3.1.0
  */
 class WP_Comment_Query {

+       /**
+        * Metadata query container
+        *
+        * @since 3.5.0
+        * @access public
+        * @var object WP_Meta_Query
+        */
+       var $meta_query = false;

 
        /**
         * Execute the query
 
        /**
         * Execute the query


@@ -213,29 +221,41 @@ class WP_Comment_Query {
                        'parent' => '',
                        'post_ID' => '',
                        'post_id' => 0,
                        'parent' => '',
                        'post_ID' => '',
                        'post_id' => 0,

+                       'post_author' => '',
+                       'post_name' => '',
+                       'post_parent' => '',
+                       'post_status' => '',
+                       'post_type' => '',

                        'status' => '',
                        'type' => '',
                        'user_id' => '',
                        'search' => '',
                        'status' => '',
                        'type' => '',
                        'user_id' => '',
                        'search' => '',

-                       'count' => false
+                       'count' => false,
+                       'meta_key' => '',
+                       'meta_value' => '',
+                       'meta_query' => '',

                );
 
                );
 

+               $groupby = '';
+

                $this->query_vars = wp_parse_args( $query_vars, $defaults );
                $this->query_vars = wp_parse_args( $query_vars, $defaults );

+
+               // Parse meta query
+               $this->meta_query = new WP_Meta_Query();
+               $this->meta_query->parse_query_vars( $this->query_vars );
+

                do_action_ref_array( 'pre_get_comments', array( &$this ) );
                extract( $this->query_vars, EXTR_SKIP );
 
                // $args can be whatever, only use the args defined in defaults to compute the key
                $key = md5( serialize( compact(array_keys($defaults)) )  );
                do_action_ref_array( 'pre_get_comments', array( &$this ) );
                extract( $this->query_vars, EXTR_SKIP );
 
                // $args can be whatever, only use the args defined in defaults to compute the key
                $key = md5( serialize( compact(array_keys($defaults)) )  );

-               $last_changed = wp_cache_get('last_changed', 'comment');
-               if ( !$last_changed ) {
-                       $last_changed = time();
-                       wp_cache_set('last_changed', $last_changed, 'comment');
-               }
+               $last_changed = wp_cache_get( 'last_changed', 'comment' );
+               if ( ! $last_changed )
+                       $last_changed = wp_cache_set( 'last_changed', 1, 'comment' );

                $cache_key = "get_comments:$key:$last_changed";
 
                $cache_key = "get_comments:$key:$last_changed";
 

-               if ( $cache = wp_cache_get( $cache_key, 'comment' ) ) {
+               if ( $cache = wp_cache_get( $cache_key, 'comment' ) )

                        return $cache;
                        return $cache;

-               }

 
                $post_id = absint($post_id);
 
 
                $post_id = absint($post_id);
 


@@ -243,10 +263,8 @@ class WP_Comment_Query {
                        $approved = "comment_approved = '0'";
                elseif ( 'approve' == $status )
                        $approved = "comment_approved = '1'";
                        $approved = "comment_approved = '0'";
                elseif ( 'approve' == $status )
                        $approved = "comment_approved = '1'";

-               elseif ( 'spam' == $status )
-                       $approved = "comment_approved = 'spam'";
-               elseif ( 'trash' == $status )
-                       $approved = "comment_approved = 'trash'";
+               elseif ( ! empty( $status ) && 'all' != $status )
+                       $approved = $wpdb->prepare( "comment_approved = %s", $status );

                else
                        $approved = "( comment_approved = '0' OR comment_approved = '1' )";
 
                else
                        $approved = "( comment_approved = '0' OR comment_approved = '1' )";
 


@@ -254,26 +272,36 @@ class WP_Comment_Query {
 
                if ( ! empty( $orderby ) ) {
                        $ordersby = is_array($orderby) ? $orderby : preg_split('/[,\s]/', $orderby);
 
                if ( ! empty( $orderby ) ) {
                        $ordersby = is_array($orderby) ? $orderby : preg_split('/[,\s]/', $orderby);

-                       $ordersby = array_intersect(
-                               $ordersby,
-                               array(
-                                       'comment_agent',
-                                       'comment_approved',
-                                       'comment_author',
-                                       'comment_author_email',
-                                       'comment_author_IP',
-                                       'comment_author_url',
-                                       'comment_content',
-                                       'comment_date',
-                                       'comment_date_gmt',
-                                       'comment_ID',
-                                       'comment_karma',
-                                       'comment_parent',
-                                       'comment_post_ID',
-                                       'comment_type',
-                                       'user_id',
-                               )
+                       $allowed_keys = array(
+                               'comment_agent',
+                               'comment_approved',
+                               'comment_author',
+                               'comment_author_email',
+                               'comment_author_IP',
+                               'comment_author_url',
+                               'comment_content',
+                               'comment_date',
+                               'comment_date_gmt',
+                               'comment_ID',
+                               'comment_karma',
+                               'comment_parent',
+                               'comment_post_ID',
+                               'comment_type',
+                               'user_id',

                        );
                        );

+                       if ( ! empty( $this->query_vars['meta_key'] ) ) {
+                               $allowed_keys[] = $this->query_vars['meta_key'];
+                               $allowed_keys[] = 'meta_value';
+                               $allowed_keys[] = 'meta_value_num';
+                       }
+                       $ordersby = array_intersect( $ordersby, $allowed_keys );
+                       foreach ( $ordersby as $key => $value ) {
+                               if ( $value == $this->query_vars['meta_key'] || $value == 'meta_value' ) {
+                                       $ordersby[ $key ] = "$wpdb->commentmeta.meta_value";
+                               } elseif ( $value == 'meta_value_num' ) {
+                                       $ordersby[ $key ] = "$wpdb->commentmeta.meta_value+0";
+                               }
+                       }

                        $orderby = empty( $ordersby ) ? 'comment_date_gmt' : implode(', ', $ordersby);
                } else {
                        $orderby = 'comment_date_gmt';
                        $orderby = empty( $ordersby ) ? 'comment_date_gmt' : implode(', ', $ordersby);
                } else {
                        $orderby = 'comment_date_gmt';


@@ -319,12 +347,29 @@ class WP_Comment_Query {
                if ( '' !== $search )
                        $where .= $this->get_search_sql( $search, array( 'comment_author', 'comment_author_email', 'comment_author_url', 'comment_author_IP', 'comment_content' ) );
 
                if ( '' !== $search )
                        $where .= $this->get_search_sql( $search, array( 'comment_author', 'comment_author_email', 'comment_author_url', 'comment_author_IP', 'comment_content' ) );
 

-               $pieces = array( 'fields', 'join', 'where', 'orderby', 'order', 'limits' );
+               $post_fields = array_filter( compact( array( 'post_author', 'post_name', 'post_parent', 'post_status', 'post_type', ) ) );
+               if ( ! empty( $post_fields ) ) {
+                       $join = "JOIN $wpdb->posts ON $wpdb->posts.ID = $wpdb->comments.comment_post_ID";
+                       foreach( $post_fields as $field_name => $field_value )
+                               $where .= $wpdb->prepare( " AND {$wpdb->posts}.{$field_name} = %s", $field_value );
+               }
+
+               if ( ! empty( $this->meta_query->queries ) ) {
+                       $clauses = $this->meta_query->get_sql( 'comment', $wpdb->comments, 'comment_ID', $this );
+                       $join .= $clauses['join'];
+                       $where .= $clauses['where'];
+                       $groupby = "{$wpdb->comments}.comment_ID";
+               }
+
+               $pieces = array( 'fields', 'join', 'where', 'orderby', 'order', 'limits', 'groupby' );

                $clauses = apply_filters_ref_array( 'comments_clauses', array( compact( $pieces ), &$this ) );
                foreach ( $pieces as $piece )
                        $$piece = isset( $clauses[ $piece ] ) ? $clauses[ $piece ] : '';
 
                $clauses = apply_filters_ref_array( 'comments_clauses', array( compact( $pieces ), &$this ) );
                foreach ( $pieces as $piece )
                        $$piece = isset( $clauses[ $piece ] ) ? $clauses[ $piece ] : '';
 

-               $query = "SELECT $fields FROM $wpdb->comments $join WHERE $where ORDER BY $orderby $order $limits";
+               if ( $groupby )
+                       $groupby = 'GROUP BY ' . $groupby;
+
+               $query = "SELECT $fields FROM $wpdb->comments $join WHERE $where $groupby ORDER BY $orderby $order $limits";

 
                if ( $count )
                        return $wpdb->get_var( $query );
 
                if ( $count )
                        return $wpdb->get_var( $query );


@@ -382,20 +427,19 @@ function get_comment_statuses( ) {
        return $status;
 }
 
        return $status;
 }
 

-

 /**
  * The date the last comment was modified.
  *
  * @since 1.5.0
  * @uses $wpdb
 /**
  * The date the last comment was modified.
  *
  * @since 1.5.0
  * @uses $wpdb

- * @global array $cache_lastcommentmodified

  *
  * @param string $timezone Which timezone to use in reference to 'gmt', 'blog',
  *             or 'server' locations.
  * @return string Last comment modified date.
  */
 function get_lastcommentmodified($timezone = 'server') {
  *
  * @param string $timezone Which timezone to use in reference to 'gmt', 'blog',
  *             or 'server' locations.
  * @return string Last comment modified date.
  */
 function get_lastcommentmodified($timezone = 'server') {

-       global $cache_lastcommentmodified, $wpdb;
+       global $wpdb;
+       static $cache_lastcommentmodified = array();

 
        if ( isset($cache_lastcommentmodified[$timezone]) )
                return $cache_lastcommentmodified[$timezone];
 
        if ( isset($cache_lastcommentmodified[$timezone]) )
                return $cache_lastcommentmodified[$timezone];


@@ -527,12 +571,12 @@ function delete_comment_meta($comment_id, $meta_key, $meta_value = '') {
  * @link http://codex.wordpress.org/Function_Reference/get_comment_meta
  *
  * @param int $comment_id Comment ID.
  * @link http://codex.wordpress.org/Function_Reference/get_comment_meta
  *
  * @param int $comment_id Comment ID.

- * @param string $key The meta key to retrieve.
+ * @param string $key Optional. The meta key to retrieve. By default, returns data for all keys.

  * @param bool $single Whether to return a single value.
  * @return mixed Will be an array if $single is false. Will be value of meta data field if $single
  *  is true.
  */
  * @param bool $single Whether to return a single value.
  * @return mixed Will be an array if $single is false. Will be value of meta data field if $single
  *  is true.
  */

-function get_comment_meta($comment_id, $key, $single = false) {
+function get_comment_meta($comment_id, $key = '', $single = false) {

        return get_metadata('comment', $comment_id, $key, $single);
 }
 
        return get_metadata('comment', $comment_id, $key, $single);
 }
 


@@ -558,6 +602,25 @@ function update_comment_meta($comment_id, $meta_key, $meta_value, $prev_value =
        return update_metadata('comment', $comment_id, $meta_key, $meta_value, $prev_value);
 }
 
        return update_metadata('comment', $comment_id, $meta_key, $meta_value, $prev_value);
 }
 

+/**
+ * Sets the cookies used to store an unauthenticated commentator's identity. Typically used
+ * to recall previous comments by this commentator that are still held in moderation.
+ *
+ * @param object $comment Comment object.
+ * @param object $user Comment author's object.
+ *
+ * @since 3.4.0
+ */
+function wp_set_comment_cookies($comment, $user) {
+       if ( $user->exists() )
+               return;
+
+       $comment_cookie_lifetime = apply_filters('comment_cookie_lifetime', 30000000);
+       setcookie('comment_author_' . COOKIEHASH, $comment->comment_author, time() + $comment_cookie_lifetime, COOKIEPATH, COOKIE_DOMAIN);
+       setcookie('comment_author_email_' . COOKIEHASH, $comment->comment_author_email, time() + $comment_cookie_lifetime, COOKIEPATH, COOKIE_DOMAIN);
+       setcookie('comment_author_url_' . COOKIEHASH, esc_url($comment->comment_author_url), time() + $comment_cookie_lifetime, COOKIEPATH, COOKIE_DOMAIN);
+}
+

 /**
  * Sanitizes the cookies sent to the user already.
  *
 /**
  * Sanitizes the cookies sent to the user already.
  *


@@ -606,7 +669,7 @@ function wp_allow_comment($commentdata) {
 
        // Simple duplicate check
        // expected_slashed ($comment_post_ID, $comment_author, $comment_author_email, $comment_content)
 
        // Simple duplicate check
        // expected_slashed ($comment_post_ID, $comment_author, $comment_author_email, $comment_content)

-       $dupe = "SELECT comment_ID FROM $wpdb->comments WHERE comment_post_ID = '$comment_post_ID' AND comment_approved != 'trash' AND ( comment_author = '$comment_author' ";
+       $dupe = "SELECT comment_ID FROM $wpdb->comments WHERE comment_post_ID = '$comment_post_ID' AND comment_parent = '$comment_parent' AND comment_approved != 'trash' AND ( comment_author = '$comment_author' ";

        if ( $comment_author_email )
                $dupe .= "OR comment_author_email = '$comment_author_email' ";
        $dupe .= ") AND comment_content = '$comment_content' LIMIT 1";
        if ( $comment_author_email )
                $dupe .= "OR comment_author_email = '$comment_author_email' ";
        $dupe .= ") AND comment_content = '$comment_content' LIMIT 1";


@@ -620,13 +683,12 @@ function wp_allow_comment($commentdata) {
 
        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 );
 

-       if ( isset($user_id) && $user_id) {
-               $userdata = get_userdata($user_id);
-               $user = new WP_User($user_id);
+       if ( ! empty( $user_id ) ) {
+               $user = get_userdata( $user_id );

                $post_author = $wpdb->get_var($wpdb->prepare("SELECT post_author FROM $wpdb->posts WHERE ID = %d LIMIT 1", $comment_post_ID));
        }
 
                $post_author = $wpdb->get_var($wpdb->prepare("SELECT post_author FROM $wpdb->posts WHERE ID = %d LIMIT 1", $comment_post_ID));
        }
 

-       if ( isset($userdata) && ( $user_id == $post_author || $user->has_cap('moderate_comments') ) ) {
+       if ( isset( $user ) && ( $user_id == $post_author || $user->has_cap( 'moderate_comments' ) ) ) {

                // The author and the admins get respect.
                $approved = 1;
         } else {
                // The author and the admins get respect.
                $approved = 1;
         } else {


@@ -664,7 +726,7 @@ function check_comment_flood_db( $ip, $email, $date ) {
        global $wpdb;
        if ( current_user_can( 'manage_options' ) )
                return; // don't throttle admins
        global $wpdb;
        if ( current_user_can( 'manage_options' ) )
                return; // don't throttle admins

-       $hour_ago = gmdate( 'Y-m-d H:i:s', time() - 3600 );
+       $hour_ago = gmdate( 'Y-m-d H:i:s', time() - HOUR_IN_SECONDS );

        if ( $lasttime = $wpdb->get_var( $wpdb->prepare( "SELECT `comment_date_gmt` FROM `$wpdb->comments` WHERE `comment_date_gmt` >= %s AND ( `comment_author_IP` = %s OR `comment_author_email` = %s ) ORDER BY `comment_date_gmt` DESC LIMIT 1", $hour_ago, $ip, $email ) ) ) {
                $time_lastcomment = mysql2date('U', $lasttime, false);
                $time_newcomment  = mysql2date('U', $date, false);
        if ( $lasttime = $wpdb->get_var( $wpdb->prepare( "SELECT `comment_date_gmt` FROM `$wpdb->comments` WHERE `comment_date_gmt` >= %s AND ( `comment_author_IP` = %s OR `comment_author_email` = %s ) ORDER BY `comment_date_gmt` DESC LIMIT 1", $hour_ago, $ip, $email ) ) ) {
                $time_lastcomment = mysql2date('U', $lasttime, false);
                $time_newcomment  = mysql2date('U', $date, false);


@@ -673,9 +735,9 @@ function check_comment_flood_db( $ip, $email, $date ) {
                        do_action('comment_flood_trigger', $time_lastcomment, $time_newcomment);
 
                        if ( defined('DOING_AJAX') )
                        do_action('comment_flood_trigger', $time_lastcomment, $time_newcomment);
 
                        if ( defined('DOING_AJAX') )

-                               die( __('You are posting comments too quickly.  Slow down.') );
+                               die( __('You are posting comments too quickly. Slow down.') );

 
 

-                       wp_die( __('You are posting comments too quickly.  Slow down.'), '', array('response' => 403) );
+                       wp_die( __('You are posting comments too quickly. Slow down.'), '', array('response' => 403) );

                }
        }
 }
                }
        }
 }


@@ -688,7 +750,7 @@ function check_comment_flood_db( $ip, $email, $date ) {
  * @param array $comments Array of comments
  * @return array Array of comments keyed by comment_type.
  */
  * @param array $comments Array of comments
  * @return array Array of comments keyed by comment_type.
  */

-function &separate_comments(&$comments) {
+function separate_comments(&$comments) {

        $comments_by_type = array('comment' => array(), 'trackback' => array(), 'pingback' => array(), 'pings' => array());
        $count = count($comments);
        for ( $i = 0; $i < $count; $i++ ) {
        $comments_by_type = array('comment' => array(), 'trackback' => array(), 'pingback' => array(), 'pings' => array());
        $count = count($comments);
        for ( $i = 0; $i < $count; $i++ ) {


@@ -711,7 +773,7 @@ function &separate_comments(&$comments) {
  * @uses get_option() Used to fill in defaults for parameters.
  * @uses Walker_Comment
  *
  * @uses get_option() Used to fill in defaults for parameters.
  * @uses Walker_Comment
  *

- * @param array $comments Optional array of comment objects.  Defaults to $wp_query->comments
+ * @param array $comments Optional array of comment objects. Defaults to $wp_query->comments

  * @param int $per_page Optional comments per page.
  * @param boolean $threaded Optional control over flat or threaded comments.
  * @return int Number of comment pages.
  * @param int $per_page Optional comments per page.
  * @param boolean $threaded Optional control over flat or threaded comments.
  * @return int Number of comment pages.


@@ -892,12 +954,11 @@ function wp_count_comments( $post_id = 0 ) {
 
        $total = 0;
        $approved = array('0' => 'moderated', '1' => 'approved', 'spam' => 'spam', 'trash' => 'trash', 'post-trashed' => 'post-trashed');
 
        $total = 0;
        $approved = array('0' => 'moderated', '1' => 'approved', 'spam' => 'spam', 'trash' => 'trash', 'post-trashed' => 'post-trashed');

-       $known_types = array_keys( $approved );

        foreach ( (array) $count as $row ) {
                // Don't count post-trashed toward totals
                if ( 'post-trashed' != $row['comment_approved'] && 'trash' != $row['comment_approved'] )
                        $total += $row['num_comments'];
        foreach ( (array) $count as $row ) {
                // Don't count post-trashed toward totals
                if ( 'post-trashed' != $row['comment_approved'] && 'trash' != $row['comment_approved'] )
                        $total += $row['num_comments'];

-               if ( in_array( $row['comment_approved'], $known_types ) )
+               if ( isset( $approved[$row['comment_approved']] ) )

                        $stats[$approved[$row['comment_approved']]] = $row['num_comments'];
        }
 
                        $stats[$approved[$row['comment_approved']]] = $row['num_comments'];
        }
 


@@ -951,15 +1012,11 @@ function wp_delete_comment($comment_id, $force_delete = false) {
        }
 
        // Delete metadata
        }
 
        // Delete metadata

-       $meta_ids = $wpdb->get_col( $wpdb->prepare( "SELECT meta_id FROM $wpdb->commentmeta WHERE comment_id = %d ", $comment_id ) );
-       if ( !empty($meta_ids) ) {
-               do_action( 'delete_commentmeta', $meta_ids );
-               $in_meta_ids = "'" . implode("', '", $meta_ids) . "'";
-               $wpdb->query( "DELETE FROM $wpdb->commentmeta WHERE meta_id IN ($in_meta_ids)" );
-               do_action( 'deleted_commentmeta', $meta_ids );
-       }
+       $meta_ids = $wpdb->get_col( $wpdb->prepare( "SELECT meta_id FROM $wpdb->commentmeta WHERE comment_id = %d", $comment_id ) );
+       foreach ( $meta_ids as $mid )
+               delete_metadata_by_mid( 'comment', $mid );

 
 

-       if ( ! $wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->comments WHERE comment_ID = %d LIMIT 1", $comment_id) ) )
+       if ( ! $wpdb->delete( $wpdb->comments, array( 'comment_ID' => $comment_id ) ) )

                return false;
        do_action('deleted_comment', $comment_id);
 
                return false;
        do_action('deleted_comment', $comment_id);
 


@@ -1105,7 +1162,7 @@ function wp_get_comment_status($comment_id) {
 
        $approved = $comment->comment_approved;
 
 
        $approved = $comment->comment_approved;
 

-       if ( $approved == NULL )
+       if ( $approved == null )

                return false;
        elseif ( $approved == '1' )
                return 'approved';
                return false;
        elseif ( $approved == '1' )
                return 'approved';


@@ -1233,6 +1290,13 @@ function wp_insert_comment($commentdata) {
        $comment = get_comment($id);
        do_action('wp_insert_comment', $id, $comment);
 
        $comment = get_comment($id);
        do_action('wp_insert_comment', $id, $comment);
 

+       if ( function_exists( 'wp_cache_incr' ) ) {
+               wp_cache_incr( 'last_changed', 1, 'comment' );
+       } else {
+               $last_changed = wp_cache_get( 'last_changed', 'comment' );
+               wp_cache_set( 'last_changed', $last_changed + 1, 'comment' );
+       }
+

        return $id;
 }
 
        return $id;
 }
 


@@ -1341,7 +1405,7 @@ function wp_new_comment( $commentdata ) {
                if ( '0' == $commentdata['comment_approved'] )
                        wp_notify_moderator($comment_ID);
 
                if ( '0' == $commentdata['comment_approved'] )
                        wp_notify_moderator($comment_ID);
 

-               $post = &get_post($commentdata['comment_post_ID']); // Don't notify if it's your own comment
+               $post = get_post($commentdata['comment_post_ID']); // Don't notify if it's your own comment

 
                if ( get_option('comments_notify') && $commentdata['comment_approved'] && ( ! isset( $commentdata['user_id'] ) || $post->post_author != $commentdata['user_id'] ) )
                        wp_notify_postauthor($comment_ID, isset( $commentdata['comment_type'] ) ? $commentdata['comment_type'] : '' );
 
                if ( get_option('comments_notify') && $commentdata['comment_approved'] && ( ! isset( $commentdata['user_id'] ) || $post->post_author != $commentdata['user_id'] ) )
                        wp_notify_postauthor($comment_ID, isset( $commentdata['comment_type'] ) ? $commentdata['comment_type'] : '' );


@@ -1353,17 +1417,14 @@ function wp_new_comment( $commentdata ) {
 /**
  * Sets the status of a comment.
  *
 /**
  * Sets the status of a comment.
  *

- * The 'wp_set_comment_status' action is called after the comment is handled and
- * will only be called, if the comment status is either 'hold', 'approve', or
- * 'spam'. If the comment status is not in the list, then false is returned and
- * if the status is 'delete', then the comment is deleted without calling the
- * action.
+ * The 'wp_set_comment_status' action is called after the comment is handled.
+ * If the comment status is not in the list, then false is returned.

  *
  * @since 1.0.0
  * @uses wp_transition_comment_status() Passes new and old comment status along with $comment object
  *
  * @param int $comment_id Comment ID.
  *
  * @since 1.0.0
  * @uses wp_transition_comment_status() Passes new and old comment status along with $comment object
  *
  * @param int $comment_id Comment ID.

- * @param string $comment_status New comment status, either 'hold', 'approve', 'spam', or 'delete'.
+ * @param string $comment_status New comment status, either 'hold', 'approve', 'spam', or 'trash'.

  * @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.
  */
  * @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.
  */


@@ -1394,7 +1455,7 @@ function wp_set_comment_status($comment_id, $comment_status, $wp_error = false)
                        return false;
        }
 
                        return false;
        }
 

-       $comment_old = wp_clone(get_comment($comment_id));
+       $comment_old = clone get_comment($comment_id);

 
        if ( !$wpdb->update( $wpdb->comments, array('comment_approved' => $status), array('comment_ID' => $comment_id) ) ) {
                if ( $wp_error )
 
        if ( !$wpdb->update( $wpdb->comments, array('comment_approved' => $status), array('comment_ID' => $comment_id) ) ) {
                if ( $wp_error )


@@ -1457,7 +1518,7 @@ function wp_update_comment($commentarr) {
        else if ( 'approve' == $comment_approved )
                $comment_approved = 1;
 
        else if ( 'approve' == $comment_approved )
                $comment_approved = 1;
 

-       $data = compact('comment_content', 'comment_author', 'comment_author_email', 'comment_approved', 'comment_karma', 'comment_author_url', 'comment_date', 'comment_date_gmt');
+       $data = compact( 'comment_content', 'comment_author', 'comment_author_email', 'comment_approved', 'comment_karma', 'comment_author_url', 'comment_date', 'comment_date_gmt', 'comment_parent' );

        $rval = $wpdb->update( $wpdb->comments, $data, compact( 'comment_ID' ) );
 
        clean_comment_cache($comment_ID);
        $rval = $wpdb->update( $wpdb->comments, $data, compact( 'comment_ID' ) );
 
        clean_comment_cache($comment_ID);


@@ -1557,10 +1618,7 @@ function wp_update_comment_count_now($post_id) {
        $new = (int) $wpdb->get_var( $wpdb->prepare("SELECT COUNT(*) FROM $wpdb->comments WHERE comment_post_ID = %d AND comment_approved = '1'", $post_id) );
        $wpdb->update( $wpdb->posts, array('comment_count' => $new), array('ID' => $post_id) );
 
        $new = (int) $wpdb->get_var( $wpdb->prepare("SELECT COUNT(*) FROM $wpdb->comments WHERE comment_post_ID = %d AND comment_approved = '1'", $post_id) );
        $wpdb->update( $wpdb->posts, array('comment_count' => $new), array('ID' => $post_id) );
 

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

 
        do_action('wp_update_comment_count', $post_id, $new, $old);
        do_action('edit_post', $post_id, $post);
 
        do_action('wp_update_comment_count', $post_id, $new, $old);
        do_action('edit_post', $post_id, $post);


@@ -1603,25 +1661,25 @@ function discover_pingback_server_uri( $url, $deprecated = '' ) {
        if ( 0 === strpos($url, $uploads_dir['baseurl']) )
                return false;
 
        if ( 0 === strpos($url, $uploads_dir['baseurl']) )
                return false;
 

-       $response = wp_remote_head( $url, array( 'timeout' => 2, 'httpversion' => '1.0' ) );
+       $response = wp_remote_head( $url, array( 'timeout' => 2, 'httpversion' => '1.0', 'reject_unsafe_urls' => true ) );

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

-       if ( isset( $response['headers']['x-pingback'] ) )
-               return $response['headers']['x-pingback'];
+       if ( wp_remote_retrieve_header( $response, 'x-pingback' ) )
+               return wp_remote_retrieve_header( $response, 'x-pingback' );

 
        // Not an (x)html, sgml, or xml page, no use going further.
 
        // Not an (x)html, sgml, or xml page, no use going further.

-       if ( isset( $response['headers']['content-type'] ) && preg_match('#(image|audio|video|model)/#is', $response['headers']['content-type']) )
+       if ( preg_match('#(image|audio|video|model)/#is', wp_remote_retrieve_header( $response, '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)
                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' ) );
+       $response = wp_remote_get( $url, array( 'timeout' => 2, 'httpversion' => '1.0', 'reject_unsafe_urls' => true ) );

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

-       $contents = $response['body'];
+       $contents = wp_remote_retrieve_body( $response );

 
        $pingback_link_offset_dquote = strpos($contents, $pingback_str_dquote);
        $pingback_link_offset_squote = strpos($contents, $pingback_str_squote);
 
        $pingback_link_offset_dquote = strpos($contents, $pingback_str_dquote);
        $pingback_link_offset_squote = strpos($contents, $pingback_str_squote);


@@ -1653,21 +1711,15 @@ function do_all_pings() {
        global $wpdb;
 
        // Do pingbacks
        global $wpdb;
 
        // Do pingbacks

-       while ($ping = $wpdb->get_row("SELECT * FROM {$wpdb->posts}, {$wpdb->postmeta} WHERE {$wpdb->posts}.ID = {$wpdb->postmeta}.post_id AND {$wpdb->postmeta}.meta_key = '_pingme' LIMIT 1")) {
-               $mid = $wpdb->get_var( "SELECT meta_id FROM {$wpdb->postmeta} WHERE post_id = {$ping->ID} AND meta_key = '_pingme' LIMIT 1");
-               do_action( 'delete_postmeta', $mid );
-               $wpdb->query( $wpdb->prepare( "DELETE FROM {$wpdb->postmeta} WHERE meta_id = %d", $mid ) );
-               do_action( 'deleted_postmeta', $mid );
-               pingback($ping->post_content, $ping->ID);
+       while ($ping = $wpdb->get_row("SELECT ID, post_content, meta_id FROM {$wpdb->posts}, {$wpdb->postmeta} WHERE {$wpdb->posts}.ID = {$wpdb->postmeta}.post_id AND {$wpdb->postmeta}.meta_key = '_pingme' LIMIT 1")) {
+               delete_metadata_by_mid( 'post', $ping->meta_id );
+               pingback( $ping->post_content, $ping->ID );

        }
 
        // Do Enclosures
        }
 
        // Do Enclosures

-       while ($enclosure = $wpdb->get_row("SELECT * FROM {$wpdb->posts}, {$wpdb->postmeta} WHERE {$wpdb->posts}.ID = {$wpdb->postmeta}.post_id AND {$wpdb->postmeta}.meta_key = '_encloseme' LIMIT 1")) {
-               $mid = $wpdb->get_var( $wpdb->prepare("SELECT meta_id FROM {$wpdb->postmeta} WHERE post_id = %d AND meta_key = '_encloseme'", $enclosure->ID) );
-               do_action( 'delete_postmeta', $mid );
-               $wpdb->query( $wpdb->prepare("DELETE FROM {$wpdb->postmeta} WHERE meta_id =  %d", $mid) );
-               do_action( 'deleted_postmeta', $mid );
-               do_enclose($enclosure->post_content, $enclosure->ID);
+       while ($enclosure = $wpdb->get_row("SELECT ID, post_content, meta_id FROM {$wpdb->posts}, {$wpdb->postmeta} WHERE {$wpdb->posts}.ID = {$wpdb->postmeta}.post_id AND {$wpdb->postmeta}.meta_key = '_encloseme' LIMIT 1")) {
+               delete_metadata_by_mid( 'post', $enclosure->meta_id );
+               do_enclose( $enclosure->post_content, $enclosure->ID );

        }
 
        // Do Trackbacks
        }
 
        // Do Trackbacks


@@ -1691,7 +1743,7 @@ function do_all_pings() {
 function do_trackbacks($post_id) {
        global $wpdb;
 
 function do_trackbacks($post_id) {
        global $wpdb;
 

-       $post = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->posts WHERE ID = %d", $post_id) );
+       $post = get_post( $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) ) {


@@ -1706,7 +1758,7 @@ function do_trackbacks($post_id) {
        $excerpt = str_replace(']]>', ']]&gt;', $excerpt);
        $excerpt = wp_html_excerpt($excerpt, 252) . '...';
 
        $excerpt = str_replace(']]>', ']]&gt;', $excerpt);
        $excerpt = wp_html_excerpt($excerpt, 252) . '...';
 

-       $post_title = apply_filters('the_title', $post->post_title);
+       $post_title = apply_filters('the_title', $post->post_title, $post->ID);

        $post_title = strip_tags($post_title);
 
        if ( $to_ping ) {
        $post_title = strip_tags($post_title);
 
        if ( $to_ping ) {


@@ -1796,7 +1848,7 @@ function pingback($content, $post_ID) {
                endif;
        endforeach;
 
                endif;
        endforeach;
 

-       do_action_ref_array('pre_ping', array(&$post_links, &$pung));
+       do_action_ref_array( 'pre_ping', array( &$post_links, &$pung, $post_ID ) );

 
        foreach ( (array) $post_links as $pagelinkedto ) {
                $pingback_server_url = discover_pingback_server_uri( $pagelinkedto );
 
        foreach ( (array) $post_links as $pagelinkedto ) {
                $pingback_server_url = discover_pingback_server_uri( $pagelinkedto );


@@ -1856,6 +1908,7 @@ function trackback($trackback_url, $title, $excerpt, $ID) {
 
        $options = array();
        $options['timeout'] = 4;
 
        $options = array();
        $options['timeout'] = 4;

+       $options['reject_unsafe_urls'] = true;

        $options['body'] = array(
                'title' => $title,
                'url' => get_permalink($ID),
        $options['body'] = array(
                'title' => $title,
                'url' => get_permalink($ID),


@@ -1899,6 +1952,37 @@ function weblog_ping($server = '', $path = '') {
                $client->query('weblogUpdates.ping', get_option('blogname'), $home);
 }
 
                $client->query('weblogUpdates.ping', get_option('blogname'), $home);
 }
 

+/**
+ * Default filter attached to pingback_ping_source_uri to validate the pingback's Source URI
+ *
+ * @since 3.5.1
+ * @see wp_http_validate_url()
+ *
+ * @param string $source_uri
+ * @return string
+ */
+function pingback_ping_source_uri( $source_uri ) {
+       return (string) wp_http_validate_url( $source_uri );
+}
+
+/**
+ * Default filter attached to xmlrpc_pingback_error.
+ *
+ * Returns a generic pingback error code unless the error code is 48,
+ * which reports that the pingback is already registered.
+ *
+ * @since 3.5.1
+ * @link http://www.hixie.ch/specs/pingback/pingback#TOC3
+ *
+ * @param IXR_Error $ixr_error
+ * @return IXR_Error
+ */
+function xmlrpc_pingback_error( $ixr_error ) {
+       if ( $ixr_error->code === 48 )
+               return $ixr_error;
+       return new IXR_Error( 0, '' );
+}
+

 //
 // Cache
 //
 //
 // Cache
 //


@@ -1916,7 +2000,12 @@ function clean_comment_cache($ids) {
        foreach ( (array) $ids as $id )
                wp_cache_delete($id, 'comment');
 
        foreach ( (array) $ids as $id )
                wp_cache_delete($id, 'comment');
 

-       wp_cache_set('last_changed', time(), 'comment');
+       if ( function_exists( 'wp_cache_incr' ) ) {
+               wp_cache_incr( 'last_changed', 1, 'comment' );
+       } else {
+               $last_changed = wp_cache_get( 'last_changed', 'comment' );
+               wp_cache_set( 'last_changed', $last_changed + 1, 'comment' );
+       }

 }
 
 /**
 }
 
 /**


@@ -1942,23 +2031,28 @@ function update_comment_cache($comments) {
 //
 
 /**
 //
 
 /**

- * Close comments on old posts on the fly, without any extra DB queries.  Hooked to the_posts.
+ * Close comments on old posts on the fly, without any extra DB queries. Hooked to the_posts.

  *
  * @access private
  * @since 2.7.0
  *
  * @param object $posts Post data object.
  *
  * @access private
  * @since 2.7.0
  *
  * @param object $posts Post data object.

+ * @param object $query Query object.

  * @return object
  */
  * @return object
  */

-function _close_comments_for_old_posts( $posts ) {
-       if ( empty($posts) || !is_singular() || !get_option('close_comments_for_old_posts') )
+function _close_comments_for_old_posts( $posts, $query ) {
+       if ( empty( $posts ) || ! $query->is_singular() || ! get_option( 'close_comments_for_old_posts' ) )

                return $posts;
 
                return $posts;
 

-       $days_old = (int) get_option('close_comments_days_old');
-       if ( !$days_old )
+       $post_types = apply_filters( 'close_comments_for_post_types', array( 'post' ) );
+       if ( ! in_array( $posts[0]->post_type, $post_types ) )
+               return $posts;
+
+       $days_old = (int) get_option( 'close_comments_days_old' );
+       if ( ! $days_old )

                return $posts;
 
                return $posts;
 

-       if ( time() - strtotime( $posts[0]->post_date_gmt ) > ( $days_old * 24 * 60 * 60 ) ) {
+       if ( time() - strtotime( $posts[0]->post_date_gmt ) > ( $days_old * DAY_IN_SECONDS ) ) {

                $posts[0]->comment_status = 'closed';
                $posts[0]->ping_status = 'closed';
        }
                $posts[0]->comment_status = 'closed';
                $posts[0]->ping_status = 'closed';
        }


@@ -1967,7 +2061,7 @@ function _close_comments_for_old_posts( $posts ) {
 }
 
 /**
 }
 
 /**

- * Close comments on an old post.  Hooked to comments_open and pings_open.
+ * Close comments on an old post. Hooked to comments_open and pings_open.

  *
  * @access private
  * @since 2.7.0
  *
  * @access private
  * @since 2.7.0


@@ -1989,10 +2083,12 @@ function _close_comments_for_old_post( $open, $post_id ) {
 
        $post = get_post($post_id);
 
 
        $post = get_post($post_id);
 

-       if ( time() - strtotime( $post->post_date_gmt ) > ( $days_old * 24 * 60 * 60 ) )
+       $post_types = apply_filters( 'close_comments_for_post_types', array( 'post' ) );
+       if ( ! in_array( $post->post_type, $post_types ) )
+               return $open;
+
+       if ( time() - strtotime( $post->post_date_gmt ) > ( $days_old * DAY_IN_SECONDS ) )

                return false;
 
        return $open;
 }
                return false;
 
        return $open;
 }

-
-?>