From 44ad0964b0ca5794c5a35dee812256c3054f7a26 Mon Sep 17 00:00:00 2001
From: Andrea Fercia <a.fercia@gmail.com>
Date: Tue, 12 Jan 2016 08:58:26 +0000
Subject: [PATCH] After [36263] escape filterable HTML output.

Props adamsilverstein.
Fixes #35064.
Built from https://develop.svn.wordpress.org/trunk@36267


git-svn-id: http://core.svn.wordpress.org/trunk@36234 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/options-general.php | 4 ++--
 wp-includes/version.php      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/wp-admin/options-general.php b/wp-admin/options-general.php
index 5f18170ea8..11bda9545e 100644
--- a/wp-admin/options-general.php
+++ b/wp-admin/options-general.php
@@ -243,7 +243,7 @@ if ( empty($tzstring) ) { // Create a UTC+- zone if no timezone string exists
 			echo " checked='checked'";
 			$custom = false;
 		}
-		echo ' /> <span class="date-time-text format-i18n">' . date_i18n( $format ) . '</span><code>' . $format . "</code></label><br />\n";
+		echo ' /> <span class="date-time-text format-i18n">' . date_i18n( $format ) . '</span><code>' . esc_html( $format ) . "</code></label><br />\n";
 	}
 
 	echo '<label><input type="radio" name="date_format" id="date_format_custom_radio" value="\c\u\s\t\o\m"';
@@ -279,7 +279,7 @@ if ( empty($tzstring) ) { // Create a UTC+- zone if no timezone string exists
 			echo " checked='checked'";
 			$custom = false;
 		}
-		echo ' /> <span class="date-time-text format-i18n">' . date_i18n( $format ) . '</span><code>' . $format . "</code></label><br />\n";
+		echo ' /> <span class="date-time-text format-i18n">' . date_i18n( $format ) . '</span><code>' . esc_html( $format ) . "</code></label><br />\n";
 	}
 
 	echo '<label><input type="radio" name="time_format" id="time_format_custom_radio" value="\c\u\s\t\o\m"';
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 2e1b88fefe..0862fddd5a 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.5-alpha-36266';
+$wp_version = '4.5-alpha-36267';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.