Changeset 31250

Timestamp:

01/20/2015 07:02:53 PM (12 years ago)

Author:

lancewillett

Message:

Twenty Fourteen: fix escaping and minor code style issues. See #29127.

Location:

trunk/src/wp-content/themes/twentyfourteen

Files:

• comments.php (modified) (1 diff)
• featured-content.php (modified) (1 diff)
• image.php (modified) (1 diff)
• inc/custom-header.php (modified) (1 diff)
• inc/featured-content.php (modified) (2 diffs)
• inc/widgets.php (modified) (2 diffs)
• js/keyboard-image-navigation.js (modified) (1 diff)
• js/slider.js (modified) (1 diff)

trunk/src/wp-content/themes/twentyfourteen/comments.php

@@ -41 +41 @@
                 <?php
                         wp_list_comments( array(
-                                'style'      => 'ol',
-                                'short_ping' => true,
-                                'avatar_size'=> 34,
+                                'style'       => 'ol',
+                                'short_ping'  => true,
+                                'avatar_size' => 34,
                         ) );
                 ?>

trunk/src/wp-content/themes/twentyfourteen/featured-content.php

@@ -23 +23 @@
                         setup_postdata( $post );
 
-                         // Include the featured content template.
+                        // Include the featured content template.
                         get_template_part( 'content', 'featured-post' );
                 endforeach;

trunk/src/wp-content/themes/twentyfourteen/image.php

@@ -29 +29 @@
                                                 <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>

trunk/src/wp-content/themes/twentyfourteen/inc/custom-header.php

@@ -141 +141 @@
                 <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

trunk/src/wp-content/themes/twentyfourteen/inc/featured-content.php

@@ -326 +326 @@
 
                 $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 ] );
@@ -370 +370 @@
 
                 $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 ] );

trunk/src/wp-content/themes/twentyfourteen/inc/widgets.php

@@ -108 +108 @@
                         ?>
                         <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>
@@ -262 +262 @@
                         <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>

trunk/src/wp-content/themes/twentyfourteen/js/keyboard-image-navigation.js

@@ -15 +15 @@
                 }
 
-                if ( url && ( !$( 'textarea, input' ).is( ':focus' ) ) ) {
+                if ( url && ( ! $( 'textarea, input' ).is( ':focus' ) ) ) {
                         window.location = url;
                 }

trunk/src/wp-content/themes/twentyfourteen/js/slider.js

@@ -525 +525 @@
                         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();