From 164452f9426539577da876575b4fcb880985a2f2 Mon Sep 17 00:00:00 2001
From: desrosj <desrosj@git.wordpress.org>
Date: Tue, 18 Dec 2018 16:46:48 +0000
Subject: [PATCH] KSES: Conditionally remove the `<form>` element from
 `$allowedposttags`.

To avoid backwards compatibility issues, `<form>` is re-added if a custom filter has added the `<input>` or `<select>` elements to `$allowedposttags`.

Merges [43994] to trunk.
Built from https://develop.svn.wordpress.org/trunk@44293


git-svn-id: http://core.svn.wordpress.org/trunk@44123 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/kses.php    | 32 ++++++++++++++++++++++----------
 wp-includes/version.php |  2 +-
 2 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/wp-includes/kses.php b/wp-includes/kses.php
index 02ff401010..9187aeb015 100644
--- a/wp-includes/kses.php
+++ b/wp-includes/kses.php
@@ -187,15 +187,6 @@ if ( ! CUSTOM_TAGS ) {
 			'lang'     => true,
 			'xml:lang' => true,
 		),
-		'form'       => array(
-			'action'         => true,
-			'accept'         => true,
-			'accept-charset' => true,
-			'enctype'        => true,
-			'method'         => true,
-			'name'           => true,
-			'target'         => true,
-		),
 		'h1'         => array(
 			'align' => true,
 		),
@@ -824,6 +815,7 @@ function wp_kses_one_attr( $string, $element ) {
  * Returns an array of allowed HTML tags and attributes for a given context.
  *
  * @since 3.5.0
+ * @since 5.0.1 `form` removed as allowable HTML tag.
  *
  * @global array $allowedposttags
  * @global array $allowedtags
@@ -852,7 +844,27 @@ function wp_kses_allowed_html( $context = '' ) {
 	switch ( $context ) {
 		case 'post':
 			/** This filter is documented in wp-includes/kses.php */
-			return apply_filters( 'wp_kses_allowed_html', $allowedposttags, $context );
+			$tags = apply_filters( 'wp_kses_allowed_html', $allowedposttags, $context );
+
+			// 5.0.1 removed the `<form>` tag, allow it if a filter is allowing it's sub-elements `<input>` or `<select>`.
+			if ( ! CUSTOM_TAGS && ! isset( $tags['form'] ) && ( isset( $tags['input'] ) || isset( $tags['select'] ) ) ) {
+				$tags = $allowedposttags;
+
+				$tags['form'] = array(
+					'action' => true,
+					'accept' => true,
+					'accept-charset' => true,
+					'enctype' => true,
+					'method' => true,
+					'name' => true,
+					'target' => true,
+				);
+
+				/** This filter is documented in wp-includes/kses.php */
+				$tags = apply_filters( 'wp_kses_allowed_html', $tags, $context );
+			}
+
+			return $tags;
 
 		case 'user_description':
 		case 'pre_user_description':
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 4adbcaf2f7..8449d0a56f 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.1-alpha-44292';
+$wp_version = '5.1-alpha-44293';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.