Make WordPress Core


Ignore:
File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/3.0/wp-includes/comment.php

    r13995 r16638  
    1919 * then the check fails.
    2020 *
    21  * If the comment is a trackback and part of the blogroll, then the trackback is
    22  * automatically whitelisted. If the comment author was approved before, then
    23  * the comment is automatically whitelisted.
     21 * If the comment author was approved before, then the comment is
     22 * automatically whitelisted.
    2423 *
    2524 * If none of the checks fail, then the failback is to set the check to pass
     
    8180    // Comment whitelisting:
    8281    if ( 1 == get_option('comment_whitelist')) {
    83         if ( 'trackback' == $comment_type || 'pingback' == $comment_type ) { // check if domain is in blogroll
    84             $uri = parse_url($url);
    85             $domain = $uri['host'];
    86             $uri = parse_url( home_url() );
    87             $home_domain = $uri['host'];
    88             if ( $wpdb->get_var($wpdb->prepare("SELECT link_id FROM $wpdb->links WHERE link_url LIKE (%s) LIMIT 1", '%'.$domain.'%')) || $domain == $home_domain )
    89                 return true;
    90             else
    91                 return false;
    92         } elseif ( $author != '' && $email != '' ) {
     82        if ( 'trackback' != $comment_type && 'pingback' != $comment_type && $author != '' && $email != '' ) {
    9383            // expected_slashed ($author, $email)
    9484            $ok_to_comment = $wpdb->get_var("SELECT comment_approved FROM $wpdb->comments WHERE comment_author = '$author' AND comment_author_email = '$email' and comment_approved = '1' LIMIT 1");
     
    16551645                $pinged[] = $tb_ping;
    16561646            } else {
    1657                 $wpdb->query( $wpdb->prepare("UPDATE $wpdb->posts SET to_ping = TRIM(REPLACE(to_ping, '$tb_ping', '')) WHERE ID = %d", $post_id) );
     1647                $wpdb->query( $wpdb->prepare("UPDATE $wpdb->posts SET to_ping = TRIM(REPLACE(to_ping, %s, '')) WHERE ID = %d", $tb_ping, $post_id) );
    16581648            }
    16591649        }
Note: See TracChangeset for help on using the changeset viewer.