Changeset 5502

Show
Ignore:
Timestamp:
05/21/07 18:01:12 (1 year ago)
Author:
markjaquith
Message:

2.0.11 coming soon

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • branches/2.0/wp-includes/functions-post.php

    r5100 r5502  
    650650 
    651651function wp_blacklist_check($author, $email, $url, $comment, $user_ip, $user_agent) { 
    652     global $wpdb
     652    global $wpdb, $wp_blacklist_reason
    653653 
    654654    do_action('wp_blacklist_check', $author, $email, $url, $comment, $user_ip, $user_agent); 
     655 
     656// mj 
     657$wp_blacklist_reason = 'encoded_char'; 
    655658 
    656659    if ( preg_match_all('/&#(\d+);/', $comment . $author . $url, $chars) ) { 
     
    677680        $word = preg_quote($word, '#'); 
    678681         
    679         $pattern = "#$word#i";  
     682        $pattern = "#$word#i"; 
     683 
     684$wp_blacklist_reason = "$pattern (author) $author"; 
    680685        if ( preg_match($pattern, $author    ) ) return true; 
     686$wp_blacklist_reason = "$pattern (email) $email"; 
    681687        if ( preg_match($pattern, $email     ) ) return true; 
     688$wp_blacklist_reason = "$pattern (url) $url"; 
    682689        if ( preg_match($pattern, $url       ) ) return true; 
     690$wp_blacklist_reason = "$pattern (url) $url"; 
    683691        if ( preg_match($pattern, $comment   ) ) return true; 
     692$wp_blacklist_reason = "$pattern (user_ip) $user_ip"; 
    684693        if ( preg_match($pattern, $user_ip   ) ) return true; 
     694$wp_blacklist_reason = "$pattern (user_agent) $user_agent"; 
    685695        if ( preg_match($pattern, $user_agent) ) return true; 
    686696    } 
    687      
     697 
     698$wp_blacklist_reason = "proxy check"; 
     699 
    688700    if ( isset($_SERVER['REMOTE_ADDR']) ) { 
    689701        if ( wp_proxy_check($_SERVER['REMOTE_ADDR']) ) return true; 
    690702    } 
    691  
     703$wp_blacklist_reason = "not a WP reason"; 
    692704    return false; 
    693705} 
  • branches/2.0/wp-includes/version.php

    r5172 r5502  
    33// This just holds the version number, in a separate file so we can bump it without cluttering the SVN 
    44 
    5 $wp_version = '2.0.10'; 
     5$wp_version = '2.0.11-RC1'; 
    66$wp_db_version = 3441; 
    77