Changeset 38048

Timestamp:

07/13/2016 02:04:10 PM (10 years ago)

Author:

rachelbaker

Message:

Comments: Include comment_content with html and without in blacklist_keys comparison.

After [38047], also include the comment_content with html in the preg_match against blacklist keys to match urls.

Props ocean90.
Fixes #37208.

Location:

trunk

Files:

• src/wp-includes/comment.php (modified) (1 diff)
• tests/phpunit/tests/comment/wpBlacklistCheck.php (modified) (2 diffs)

trunk/src/wp-includes/comment.php

@@ -1077 +1077 @@
                         || preg_match($pattern, $email)
                         || preg_match($pattern, $url)
+                        || preg_match($pattern, $comment)
                         || preg_match($pattern, $comment_without_html)
                         || preg_match($pattern, $user_ip)

trunk/tests/phpunit/tests/comment/wpBlacklistCheck.php

@@ -21 +21 @@
         }
 
+        /**
+         * @ticket 37208
+         */
         public function test_should_return_true_when_content_with_html_matches_blacklist_keys() {
                 $author       = 'Sting';
@@ -66 +69 @@
         }
 
+        /**
+         * @ticket 37208
+         */
+        public function test_should_return_true_when_link_matches_blacklist_keys() {
+                $author       = 'Rainier Wolfcastle';
+                $author_email = 'rainier@wolfcastle.com';
+                $author_url   = 'http://example.com';
+                $comment      = 'We go on TV and sing, <a href="http://example.com/spam/>sing</a>, sing.';
+                $author_ip    = '192.168.0.1';
+                $user_agent   = '';
+
+                update_option( 'blacklist_keys',"/spam/" );
+
+                $result = wp_blacklist_check( $author, $author_email, $author_url, $comment, $author_ip, $user_agent );
+
+                $this->assertTrue( $result );
+        }
+
         public function test_should_return_false_when_no_match() {
                 $author       = 'Krusty the Clown';