From 37ea642f69ddac235f7150659582c1d7cfa537da Mon Sep 17 00:00:00 2001
From: Lance Willett <lancewillett@git.wordpress.org>
Date: Tue, 20 Jan 2015 19:02:53 +0000
Subject: [PATCH] Twenty Fourteen: fix escaping and minor code style issues.
 See #29127.

git-svn-id: https://develop.svn.wordpress.org/trunk@31250 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-content/themes/twentyfourteen/comments.php           | 6 +++---
 src/wp-content/themes/twentyfourteen/featured-content.php   | 2 +-
 src/wp-content/themes/twentyfourteen/image.php              | 2 +-
 src/wp-content/themes/twentyfourteen/inc/custom-header.php  | 2 +-
 .../themes/twentyfourteen/inc/featured-content.php          | 4 ++--
 src/wp-content/themes/twentyfourteen/inc/widgets.php        | 4 ++--
 .../themes/twentyfourteen/js/keyboard-image-navigation.js   | 2 +-
 src/wp-content/themes/twentyfourteen/js/slider.js           | 2 +-
 8 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/wp-content/themes/twentyfourteen/comments.php b/src/wp-content/themes/twentyfourteen/comments.php
index 9802a2440a..781c06d4c7 100644
--- a/src/wp-content/themes/twentyfourteen/comments.php
+++ b/src/wp-content/themes/twentyfourteen/comments.php
@@ -40,9 +40,9 @@ if ( post_password_required() ) {
 	<ol class="comment-list">
 		<?php
 			wp_list_comments( array(
-				'style'      => 'ol',
-				'short_ping' => true,
-				'avatar_size'=> 34,
+				'style'       => 'ol',
+				'short_ping'  => true,
+				'avatar_size' => 34,
 			) );
 		?>
 	</ol><!-- .comment-list -->
diff --git a/src/wp-content/themes/twentyfourteen/featured-content.php b/src/wp-content/themes/twentyfourteen/featured-content.php
index 1a623acfd8..c56edf3e24 100644
--- a/src/wp-content/themes/twentyfourteen/featured-content.php
+++ b/src/wp-content/themes/twentyfourteen/featured-content.php
@@ -22,7 +22,7 @@
 		foreach ( (array) $featured_posts as $order => $post ) :
 			setup_postdata( $post );
 
-			 // Include the featured content template.
+			// Include the featured content template.
 			get_template_part( 'content', 'featured-post' );
 		endforeach;
 
diff --git a/src/wp-content/themes/twentyfourteen/image.php b/src/wp-content/themes/twentyfourteen/image.php
index 4e7fb82ac2..83ac67f68d 100644
--- a/src/wp-content/themes/twentyfourteen/image.php
+++ b/src/wp-content/themes/twentyfourteen/image.php
@@ -28,7 +28,7 @@ get_header();
 
 						<span class="entry-date"><time class="entry-date" datetime="<?php echo esc_attr( get_the_date( 'c' ) ); ?>"><?php echo esc_html( get_the_date() ); ?></time></span>
 
-						<span class="full-size-link"><a href="<?php echo esc_url( wp_get_attachment_url() ); ?>"><?php echo $metadata['width']; ?> &times; <?php echo $metadata['height']; ?></a></span>
+						<span class="full-size-link"><a href="<?php echo esc_url( wp_get_attachment_url() ); ?>"><?php echo esc_html( $metadata['width'] ); ?> &times; <?php echo esc_html( $metadata['height'] ); ?></a></span>
 
 						<span class="parent-post-link"><a href="<?php echo esc_url( get_permalink( $post->post_parent ) ); ?>" rel="gallery"><?php echo get_the_title( $post->post_parent ); ?></a></span>
 						<?php edit_post_link( __( 'Edit', 'twentyfourteen' ), '<span class="edit-link">', '</span>' ); ?>
diff --git a/src/wp-content/themes/twentyfourteen/inc/custom-header.php b/src/wp-content/themes/twentyfourteen/inc/custom-header.php
index c922e641b9..287b10682d 100644
--- a/src/wp-content/themes/twentyfourteen/inc/custom-header.php
+++ b/src/wp-content/themes/twentyfourteen/inc/custom-header.php
@@ -140,7 +140,7 @@ function twentyfourteen_admin_header_image() {
 		<?php if ( get_header_image() ) : ?>
 		<img src="<?php header_image(); ?>" alt="">
 		<?php endif; ?>
-		<h1 class="displaying-header-text"><a id="name"<?php echo sprintf( ' style="color:#%s;"', get_header_textcolor() ); ?> onclick="return false;" href="<?php echo esc_url( home_url( '/' ) ); ?>" tabindex="-1"><?php bloginfo( 'name' ); ?></a></h1>
+		<h1 class="displaying-header-text"><a id="name" style="<?php echo esc_attr( sprintf( 'color: #%s;', get_header_textcolor() ) ); ?>" onclick="return false;" href="<?php echo esc_url( home_url( '/' ) ); ?>" tabindex="-1"><?php bloginfo( 'name' ); ?></a></h1>
 	</div>
 <?php
 }
diff --git a/src/wp-content/themes/twentyfourteen/inc/featured-content.php b/src/wp-content/themes/twentyfourteen/inc/featured-content.php
index 8bc7dc5beb..5b649102ab 100644
--- a/src/wp-content/themes/twentyfourteen/inc/featured-content.php
+++ b/src/wp-content/themes/twentyfourteen/inc/featured-content.php
@@ -325,7 +325,7 @@ class Featured_Content {
 		}
 
 		$settings = self::get_setting();
-		foreach( $terms as $order => $term ) {
+		foreach ( $terms as $order => $term ) {
 			if ( ( $settings['tag-id'] === $term->term_id || $settings['tag-name'] === $term->name ) && 'post_tag' === $term->taxonomy ) {
 				unset( $terms[ $order ] );
 			}
@@ -369,7 +369,7 @@ class Featured_Content {
 		}
 
 		$settings = self::get_setting();
-		foreach( $terms as $order => $term ) {
+		foreach ( $terms as $order => $term ) {
 			if ( ( $settings['tag-id'] === $term->term_id || $settings['tag-name'] === $term->name ) && 'post_tag' === $term->taxonomy ) {
 				unset( $terms[ $term->term_id ] );
 			}
diff --git a/src/wp-content/themes/twentyfourteen/inc/widgets.php b/src/wp-content/themes/twentyfourteen/inc/widgets.php
index 9bd1e79efd..c495d2924d 100644
--- a/src/wp-content/themes/twentyfourteen/inc/widgets.php
+++ b/src/wp-content/themes/twentyfourteen/inc/widgets.php
@@ -107,7 +107,7 @@ class Twenty_Fourteen_Ephemera_Widget extends WP_Widget {
 			echo $args['before_widget'];
 			?>
 			<h1 class="widget-title <?php echo esc_attr( $format ); ?>">
-				<a class="entry-format" href="<?php echo esc_url( get_post_format_link( $format ) ); ?>"><?php echo $title; ?></a>
+				<a class="entry-format" href="<?php echo esc_url( get_post_format_link( $format ) ); ?>"><?php echo esc_html( $title ); ?></a>
 			</h1>
 			<ol>
 
@@ -261,7 +261,7 @@ class Twenty_Fourteen_Ephemera_Widget extends WP_Widget {
 			<p><label for="<?php echo esc_attr( $this->get_field_id( 'format' ) ); ?>"><?php _e( 'Post format to show:', 'twentyfourteen' ); ?></label>
 			<select id="<?php echo esc_attr( $this->get_field_id( 'format' ) ); ?>" class="widefat" name="<?php echo esc_attr( $this->get_field_name( 'format' ) ); ?>">
 				<?php foreach ( $this->formats as $slug ) : ?>
-				<option value="<?php echo esc_attr( $slug ); ?>"<?php selected( $format, $slug ); ?>><?php echo get_post_format_string( $slug ); ?></option>
+				<option value="<?php echo esc_attr( $slug ); ?>"<?php selected( $format, $slug ); ?>><?php echo esc_html( get_post_format_string( $slug ) ); ?></option>
 				<?php endforeach; ?>
 			</select>
 		<?php
diff --git a/src/wp-content/themes/twentyfourteen/js/keyboard-image-navigation.js b/src/wp-content/themes/twentyfourteen/js/keyboard-image-navigation.js
index f1e2facda3..7073235b34 100644
--- a/src/wp-content/themes/twentyfourteen/js/keyboard-image-navigation.js
+++ b/src/wp-content/themes/twentyfourteen/js/keyboard-image-navigation.js
@@ -14,7 +14,7 @@
 			url = $( '.entry-attachment a' ).attr( 'href' );
 		}
 
-		if ( url && ( !$( 'textarea, input' ).is( ':focus' ) ) ) {
+		if ( url && ( ! $( 'textarea, input' ).is( ':focus' ) ) ) {
 			window.location = url;
 		}
 	} );
diff --git a/src/wp-content/themes/twentyfourteen/js/slider.js b/src/wp-content/themes/twentyfourteen/js/slider.js
index 2fdb99ded7..1a08c6263a 100644
--- a/src/wp-content/themes/twentyfourteen/js/slider.js
+++ b/src/wp-content/themes/twentyfourteen/js/slider.js
@@ -524,7 +524,7 @@
 		slider.doMath = function() {
 			var slide = slider.slides.first();
 
-			slider.w = ( slider.viewport===undefined ) ? slider.width() : slider.viewport.width();
+			slider.w = ( slider.viewport === undefined ) ? slider.width() : slider.viewport.width();
 			slider.h = slide.height();
 			slider.boxPadding = slide.outerWidth() - slide.width();