Changeset 13150

Timestamp:

02/14/2010 10:59:37 AM (15 years ago)

Author:

nacin

Message:

Adjust regex for counting links in a comment when checking if it needs to be held for moderation. Also fix notice in wp_new_comment(). see #11830

File:

• trunk/wp-includes/comment.php (modified) (2 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( '/<a [^>]*href/i', apply_filters( 'comment_text', $comment ), $out) >= get_option( 'comment_max_links' ) )
         return false; // Check # of external links
 
@@ -1268 +1268 @@
         $post = &get_post($commentdata['comment_post_ID']); // Don't notify if it's your own comment
 
-        if ( get_option('comments_notify') && $commentdata['comment_approved'] && $post->post_author != $commentdata['user_id'] )
+        if ( isset( $commentdata['user_id'] ) && get_option('comments_notify') && $commentdata['comment_approved'] && $post->post_author != $commentdata['user_id'] )
             wp_notify_postauthor($comment_ID, $commentdata['comment_type']);
     }