From 2040186a5df4320f4ad52571c4a36001e291be19 Mon Sep 17 00:00:00 2001
From: Rachel Baker <rachel@rachelbaker.me>
Date: Wed, 13 Jul 2016 14:05:29 +0000
Subject: [PATCH] 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.
Built from https://develop.svn.wordpress.org/trunk@38048


git-svn-id: http://core.svn.wordpress.org/trunk@37989 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/comment.php | 1 +
 wp-includes/version.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/wp-includes/comment.php b/wp-includes/comment.php
index 6ec4b44266..ef4b553767 100644
--- a/wp-includes/comment.php
+++ b/wp-includes/comment.php
@@ -1076,6 +1076,7 @@ function wp_blacklist_check($author, $email, $url, $comment, $user_ip, $user_age
 			   preg_match($pattern, $author)
 			|| preg_match($pattern, $email)
 			|| preg_match($pattern, $url)
+			|| preg_match($pattern, $comment)
 			|| preg_match($pattern, $comment_without_html)
 			|| preg_match($pattern, $user_ip)
 			|| preg_match($pattern, $user_agent)
diff --git a/wp-includes/version.php b/wp-includes/version.php
index e79185776f..0364a9c0b5 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.6-beta2-38047';
+$wp_version = '4.6-beta2-38048';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.