From 86f29795a4eafecad3679af3435e8adbd89e1403 Mon Sep 17 00:00:00 2001
From: Scott Taylor <scott.c.taylor@mac.com>
Date: Fri, 16 Jan 2015 16:07:23 +0000
Subject: [PATCH] Add `<s>` to `$allowedtags` in KSES.

From https://developer.mozilla.org/en-US/docs/Web/HTML/Element/s :
"The <strike> element, alter ego of the <s> element is obsolete and should not be used on Web sites any more."

`<strike>` shall remain for BC, but `<s>` should not be stripped from the author (et al) role's HTML input.

Props paulschreiber.
Fixes #30954.

Built from https://develop.svn.wordpress.org/trunk@31205


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

diff --git a/wp-includes/kses.php b/wp-includes/kses.php
index 69d897efc1..ba96b089e5 100644
--- a/wp-includes/kses.php
+++ b/wp-includes/kses.php
@@ -441,6 +441,7 @@ if ( ! CUSTOM_TAGS ) {
 		'q' => array(
 			'cite' => true,
 		),
+		's' => array(),
 		'strike' => array(),
 		'strong' => array(),
 	);
diff --git a/wp-includes/version.php b/wp-includes/version.php
index a98462c4f7..271e483ca8 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.2-alpha-31204';
+$wp_version = '4.2-alpha-31205';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.