Changes from branches/3.0/wp-includes/comment.php at r16638 to trunk/wp-includes/comment.php at r17053

File:

• trunk/wp-includes/comment.php (modified) (16 diffs)

trunk/wp-includes/comment.php

@@ -45 +45 @@
         return false; // If moderation is set to manual
 
+    $comment = apply_filters( 'comment_text', $comment );
+
     // Check # of external links
     if ( $max_links = get_option( 'comment_max_links' ) ) {
-        $num_links = preg_match_all( '/<a [^>]*href/i', apply_filters( 'comment_text', $comment ), $out );
+        $num_links = preg_match_all( '/<a [^>]*href/i', $comment, $out );
         $num_links = apply_filters( 'comment_max_links_url', $num_links, $url ); // provide for counting of $url as a link
         if ( $num_links >= $max_links )
@@ -179 +181 @@
  */
 function get_comments( $args = '' ) {
-    global $wpdb;
-
-    $defaults = array(
-        'author_email' => '',
-        'ID' => '',
-        'karma' => '',
-        'number' => '',
-        'offset' => '',
-        'orderby' => '',
-        'order' => 'DESC',
-        'parent' => '',
-        'post_ID' => '',
-        'post_id' => 0,
-        'status' => '',
-        'type' => '',
-        'user_id' => '',
-    );
-
-    $args = wp_parse_args( $args, $defaults );
-    extract( $args, 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');
-    }
-    $cache_key = "get_comments:$key:$last_changed";
-
-    if ( $cache = wp_cache_get( $cache_key, 'comment' ) ) {
-        return $cache;
-    }
-
-    $post_id = absint($post_id);
-
-    if ( 'hold' == $status )
-        $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'";
-    else
-        $approved = "( comment_approved = '0' OR comment_approved = '1' )";
-
-    $order = ( 'ASC' == $order ) ? 'ASC' : 'DESC';
-
-    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',
-            )
+    $query = new WP_Comment_Query;
+    return $query->query( $args );
+}
+
+/**
+ * WordPress Comment Query class.
+ *
+ * @since 3.1.0
+ */
+class WP_Comment_Query {
+
+    /**
+     * Execute the query
+     *
+     * @since 3.1.0
+     *
+     * @param string|array $query_vars
+     * @return int|array
+     */
+    function query( $query_vars ) {
+        global $wpdb;
+
+        $defaults = array(
+            'author_email' => '',
+            'ID' => '',
+            'karma' => '',
+            'number' => '',
+            'offset' => '',
+            'orderby' => '',
+            'order' => 'DESC',
+            'parent' => '',
+            'post_ID' => '',
+            'post_id' => 0,
+            'status' => '',
+            'type' => '',
+            'user_id' => '',
+            'search' => '',
+            'count' => false
         );
-        $orderby = empty( $ordersby ) ? 'comment_date_gmt' : implode(', ', $ordersby);
-    } else {
-        $orderby = 'comment_date_gmt';
-    }
-
-    $number = absint($number);
-    $offset = absint($offset);
-
-    if ( !empty($number) ) {
-        if ( $offset )
-            $number = 'LIMIT ' . $offset . ',' . $number;
+
+        $this->query_vars = wp_parse_args( $query_vars, $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');
+        }
+        $cache_key = "get_comments:$key:$last_changed";
+
+        if ( $cache = wp_cache_get( $cache_key, 'comment' ) ) {
+            return $cache;
+        }
+
+        $post_id = absint($post_id);
+
+        if ( 'hold' == $status )
+            $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'";
         else
-            $number = 'LIMIT ' . $number;
-
-    } else {
-        $number = '';
-    }
-
-    $post_where = '';
-
-    if ( ! empty($post_id) )
-        $post_where .= $wpdb->prepare( 'comment_post_ID = %d AND ', $post_id );
-    if ( '' !== $author_email )
-        $post_where .= $wpdb->prepare( 'comment_author_email = %s AND ', $author_email );
-    if ( '' !== $karma )
-        $post_where .= $wpdb->prepare( 'comment_karma = %d AND ', $karma );
-    if ( 'comment' == $type )
-        $post_where .= "comment_type = '' AND ";
-    elseif ( ! empty( $type ) )
-        $post_where .= $wpdb->prepare( 'comment_type = %s AND ', $type );
-    if ( '' !== $parent )
-        $post_where .= $wpdb->prepare( 'comment_parent = %d AND ', $parent );
-    if ( '' !== $user_id )
-        $post_where .= $wpdb->prepare( 'user_id = %d AND ', $user_id );
-
-    $comments = $wpdb->get_results( "SELECT * FROM $wpdb->comments WHERE $post_where $approved ORDER BY $orderby $order $number" );
-    wp_cache_add( $cache_key, $comments, 'comment' );
-
-    return $comments;
+            $approved = "( comment_approved = '0' OR comment_approved = '1' )";
+
+        $order = ( 'ASC' == strtoupper($order) ) ? 'ASC' : 'DESC';
+
+        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',
+                )
+            );
+            $orderby = empty( $ordersby ) ? 'comment_date_gmt' : implode(', ', $ordersby);
+        } else {
+            $orderby = 'comment_date_gmt';
+        }
+
+        $number = absint($number);
+        $offset = absint($offset);
+
+        if ( !empty($number) ) {
+            if ( $offset )
+                $limits = 'LIMIT ' . $offset . ',' . $number;
+            else
+                $limits = 'LIMIT ' . $number;
+        } else {
+            $limits = '';
+        }
+
+        if ( $count )
+            $fields = 'COUNT(*)';
+        else
+            $fields = '*';
+
+        $join = '';
+        $where = $approved;
+
+        if ( ! empty($post_id) )
+            $where .= $wpdb->prepare( ' AND comment_post_ID = %d', $post_id );
+        if ( '' !== $author_email )
+            $where .= $wpdb->prepare( ' AND comment_author_email = %s', $author_email );
+        if ( '' !== $karma )
+            $where .= $wpdb->prepare( ' AND comment_karma = %d', $karma );
+        if ( 'comment' == $type ) {
+            $where .= " AND comment_type = ''";
+        } elseif( 'pings' == $type ) {
+            $where .= ' AND comment_type IN ("pingback", "trackback")';
+        } elseif ( ! empty( $type ) ) {
+            $where .= $wpdb->prepare( ' AND comment_type = %s', $type );
+        }
+        if ( '' !== $parent )
+            $where .= $wpdb->prepare( ' AND comment_parent = %d', $parent );
+        if ( '' !== $user_id )
+            $where .= $wpdb->prepare( ' AND user_id = %d', $user_id );
+        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' );
+        $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 ( $count )
+            return $wpdb->get_var( $query );
+
+        $comments = $wpdb->get_results( $query );
+        $comments = apply_filters_ref_array( 'the_comments', array( $comments, &$this ) );
+
+        wp_cache_add( $cache_key, $comments, 'comment' );
+
+        return $comments;
+    }
+
+    /*
+     * Used internally to generate an SQL string for searching across multiple columns
+     *
+     * @access protected
+     * @since 3.1.0
+     *
+     * @param string $string
+     * @param array $cols
+     * @return string
+     */
+    function get_search_sql( $string, $cols ) {
+        $string = esc_sql( like_escape( $string ) );
+
+        $searches = array();
+        foreach ( $cols as $col )
+            $searches[] = "$col LIKE '%$string%'";
+
+        return ' AND (' . implode(' OR ', $searches) . ')';
+    }
 }
 
@@ -423 +491 @@
  *
  * @param int $comment_id Comment ID.
- * @param string $key Metadata name.
- * @param mixed $value Metadata value.
+ * @param string $meta_key Metadata name.
+ * @param mixed $meta_value Metadata value.
  * @param bool $unique Optional, default is false. Whether the same key should not be added.
  * @return bool False for failure. True for success.
@@ -482 +550 @@
  *
  * @param int $comment_id Comment ID.
- * @param string $key Metadata key.
- * @param mixed $value Metadata value.
+ * @param string $meta_key Metadata key.
+ * @param mixed $meta_value Metadata value.
  * @param mixed $prev_value Optional. Previous value to check before removing.
  * @return bool False on failure, true if success.
@@ -572 +640 @@
     }
 
-    $approved = apply_filters('pre_comment_approved', $approved);
+    $approved = apply_filters( 'pre_comment_approved', $approved, $commentdata );
     return $approved;
 }
@@ -1087 +1155 @@
     if ( $new_status != $old_status ) {
         do_action('transition_comment_status', $new_status, $old_status, $comment);
-        do_action("comment_${old_status}_to_$new_status", $comment);
-    }
-    do_action("comment_${new_status}_$comment->comment_type", $comment->comment_ID, $comment);
+        do_action("comment_{$old_status}_to_{$new_status}", $comment);
+    }
+    do_action("comment_{$new_status}_{$comment->comment_type}", $comment->comment_ID, $comment);
 }
 
@@ -1119 +1187 @@
         $comment_author_url = $_COOKIE['comment_author_url_'.COOKIEHASH];
 
-    return compact('comment_author', 'comment_author_email', 'comment_author_url');
+    return apply_filters('wp_get_current_commenter', compact('comment_author', 'comment_author_email', 'comment_author_url'));
 }
 
@@ -1229 +1297 @@
  * filter for processing the comment data before the function handles it.
  *
+ * We use REMOTE_ADDR here directly. If you are behind a proxy, you should ensure
+ * that it is properly set, such as in wp-config.php, for your environment.
+ * See {@link http://core.trac.wordpress.org/ticket/9235}
+ *
  * @since 1.5.0
  * @uses apply_filters() Calls 'preprocess_comment' hook on $commentdata parameter array before processing
@@ -1273 +1345 @@
 
         if ( get_option('comments_notify') && $commentdata['comment_approved'] && ( ! isset( $commentdata['user_id'] ) || $post->post_author != $commentdata['user_id'] ) )
-            wp_notify_postauthor($comment_ID, empty( $commentdata['comment_type'] ) ? $commentdata['comment_type'] : '' );
+            wp_notify_postauthor($comment_ID, isset( $commentdata['comment_type'] ) ? $commentdata['comment_type'] : '' );
     }
 
@@ -1685 +1757 @@
     global $wp_version;
     include_once(ABSPATH . WPINC . '/class-IXR.php');
+    include_once(ABSPATH . WPINC . '/class-wp-http-ixr-client.php');
 
     // original code by Mort (http://mort.mine.nu:8080)
@@ -1718 +1791 @@
                 if ( isset($test['query']) )
                     $post_links[] = $link_test;
-                elseif ( ($test['path'] != '/') && ($test['path'] != '') )
+                elseif ( isset( $test['path'] ) && ( $test['path'] != '/' ) && ( $test['path'] != '' ) )
                     $post_links[] = $link_test;
             }
@@ -1727 +1800 @@
 
     foreach ( (array) $post_links as $pagelinkedto ) {
-        $pingback_server_url = discover_pingback_server_uri($pagelinkedto, 2048);
+        $pingback_server_url = discover_pingback_server_uri( $pagelinkedto );
 
         if ( $pingback_server_url ) {
@@ -1735 +1808 @@
 
             // using a timeout of 3 seconds should be enough to cover slow servers
-            $client = new IXR_Client($pingback_server_url);
+            $client = new WP_HTTP_IXR_Client($pingback_server_url);
             $client->timeout = 3;
             $client->useragent = apply_filters( 'pingback_useragent', $client->useragent . ' -- WordPress/' . $wp_version, $client->useragent, $pingback_server_url, $pagelinkedto, $pagelinkedfrom);
@@ -1796 +1869 @@
         return;
 
-    $tb_url = addslashes( $trackback_url );
-    $wpdb->query( $wpdb->prepare("UPDATE $wpdb->posts SET pinged = CONCAT(pinged, '\n', '$tb_url') WHERE ID = %d", $ID) );
-    return $wpdb->query( $wpdb->prepare("UPDATE $wpdb->posts SET to_ping = TRIM(REPLACE(to_ping, '$tb_url', '')) WHERE ID = %d", $ID) );
+    $wpdb->query( $wpdb->prepare("UPDATE $wpdb->posts SET pinged = CONCAT(pinged, '\n', %s) WHERE ID = %d", $trackback_url, $ID) );
+    return $wpdb->query( $wpdb->prepare("UPDATE $wpdb->posts SET to_ping = TRIM(REPLACE(to_ping, %s, '')) WHERE ID = %d", $trackback_url, $ID) );
 }
 
@@ -1814 +1886 @@
     global $wp_version;
     include_once(ABSPATH . WPINC . '/class-IXR.php');
+    include_once(ABSPATH . WPINC . '/class-wp-http-ixr-client.php');
 
     // using a timeout of 3 seconds should be enough to cover slow servers
-    $client = new IXR_Client($server, ((!strlen(trim($path)) || ('/' == $path)) ? false : $path));
+    $client = new WP_HTTP_IXR_Client($server, ((!strlen(trim($path)) || ('/' == $path)) ? false : $path));
     $client->timeout = 3;
     $client->useragent .= ' -- WordPress/'.$wp_version;
@@ -1838 +1911 @@
  * @subpackage Cache
  *
- * @param int|array $id Comment ID or array of comment IDs to remove from cache
+ * @param int|array $ids Comment ID or array of comment IDs to remove from cache
  */
 function clean_comment_cache($ids) {
     foreach ( (array) $ids as $id )
         wp_cache_delete($id, 'comment');
+
+    wp_cache_set('last_changed', time(), 'comment');
 }