Changes from branches/2.7/wp-includes/comment.php at r10454 to trunk/wp-includes/comment.php at r10150

File:

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

trunk/wp-includes/comment.php

@@ -46 +46 @@
         return false; // If moderation is set to manual
 
-    if ( get_option('comment_max_links') && preg_match_all("/<[Aa][^>]*[Hh][Rr][Ee][Ff]=['\"]([^\"'>]+)[^>]*>/", apply_filters('comment_text',$comment), $out) >= get_option('comment_max_links') )
+    if ( get_option('comment_max_links') && preg_match_all("|(href\t*?=\t*?['\"]?)?(https?:)?//|i", apply_filters('comment_text', $comment), $out) >= get_option('comment_max_links') )
         return false; // Check # of external links
 
@@ -593 +593 @@
 
     // Count comments older than this one
-    $oldercoms = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(comment_ID) FROM $wpdb->comments WHERE comment_post_ID = %d AND comment_parent = 0 AND comment_approved = '1' AND comment_date_gmt < '%s'" . $comtypewhere, $comment->comment_post_ID, $comment->comment_date_gmt ) );
+    $oldercoms = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(comment_ID) FROM $wpdb->comments WHERE comment_post_ID = %d AND comment_parent = 0 AND comment_date_gmt < '%s'" . $comtypewhere, $comment->comment_post_ID, $comment->comment_date_gmt ) );
 
     // No older comments? Then it's page #1.
@@ -1581 +1581 @@
  */
 function _close_comments_for_old_posts( $posts ) {
-    if ( empty($posts) || !is_singular() || !get_option('close_comments_for_old_posts') )
+    if ( empty($posts) || !is_single() || !get_option('close_comments_for_old_posts') )
         return $posts;