From 5a84e326529200b3c74c445f0953718b4f0c993f Mon Sep 17 00:00:00 2001
From: Andrew Nacin <wp@andrewnacin.com>
Date: Mon, 27 Apr 2015 05:10:27 +0000
Subject: [PATCH] Escape the $s global.

fixes #32142.

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


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

diff --git a/wp-includes/template.php b/wp-includes/template.php
index cfe9bb06aa..e43ba321e5 100644
--- a/wp-includes/template.php
+++ b/wp-includes/template.php
@@ -494,12 +494,18 @@ function locate_template($template_names, $load = false, $require_once = true )
 function load_template( $_template_file, $require_once = true ) {
 	global $posts, $post, $wp_did_header, $wp_query, $wp_rewrite, $wpdb, $wp_version, $wp, $id, $comment, $user_ID;
 
-	if ( is_array( $wp_query->query_vars ) )
+	if ( is_array( $wp_query->query_vars ) ) {
 		extract( $wp_query->query_vars, EXTR_SKIP );
+	}
 
-	if ( $require_once )
+	if ( isset( $s ) ) {
+		$s = esc_attr( $s );
+	}
+
+	if ( $require_once ) {
 		require_once( $_template_file );
-	else
+	} else {
 		require( $_template_file );
+	}
 }
 
diff --git a/wp-includes/version.php b/wp-includes/version.php
index c76982d5e4..0315199aae 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.3-alpha-32297';
+$wp_version = '4.3-alpha-32298';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.