Changeset 31260

Timestamp:

01/21/2015 08:48:45 PM (10 years ago)

Author:

lancewillett

Message:

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

Location:

trunk/src/wp-content/themes/twentythirteen

Files:

• functions.php (modified) (3 diffs)
• inc/custom-header.php (modified) (1 diff)
• taxonomy-post_format.php (modified) (1 diff)

trunk/src/wp-content/themes/twentythirteen/functions.php

@@ -147 +147 @@
             'subset' => urlencode( 'latin,latin-ext' ),
         );
-        $fonts_url = add_query_arg( $query_args, "//fonts.googleapis.com/css" );
+        $fonts_url = add_query_arg( $query_args, '//fonts.googleapis.com/css' );
     }
 
@@ -320 +320 @@
 function twentythirteen_entry_meta() {
     if ( is_sticky() && is_home() && ! is_paged() )
-        echo '<span class="featured-post">' . __( 'Sticky', 'twentythirteen' ) . '</span>';
+        echo '<span class="featured-post">' . esc_html__( 'Sticky', 'twentythirteen' ) . '</span>';
 
     if ( ! has_post_format( 'link' ) && 'post' == get_post_type() )
@@ -414 +414 @@
         'post_mime_type' => 'image',
         'order'          => 'ASC',
-        'orderby'        => 'menu_order ID'
+        'orderby'        => 'menu_order ID',
     ) );
 

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

@@ -217 +217 @@
  */
 function twentythirteen_admin_header_image() {
-    ?>
-    <div id="headimg" style="background: url(<?php header_image(); ?>) no-repeat scroll top; background-size: 1600px auto;">
-        <?php $style = ' style="color:#' . get_header_textcolor() . ';"'; ?>
+    $style = 'color: #' . get_header_textcolor() . ';';
+    if ( ! display_header_text() ) {
+        $style = 'display: none;';
+    }
+    ?>
+    <div id="headimg" style="background: url(<?php echo esc_url( get_header_image() ); ?>) no-repeat scroll top; background-size: 1600px auto;">
         <div class="home-link">
-            <h1 class="displaying-header-text"><a id="name"<?php echo $style; ?> onclick="return false;" href="#" tabindex="-1"><?php bloginfo( 'name' ); ?></a></h1>
-            <h2 id="desc" class="displaying-header-text"<?php echo $style; ?>><?php bloginfo( 'description' ); ?></h2>
+            <h1 class="displaying-header-text"><a id="name" style="<?php echo esc_attr( $style ); ?>" onclick="return false;" href="#" tabindex="-1"><?php bloginfo( 'name' ); ?></a></h1>
+            <h2 id="desc" class="displaying-header-text" style="<?php echo esc_attr( $style ); ?>"><?php bloginfo( 'description' ); ?></h2>
         </div>
     </div>

trunk/src/wp-content/themes/twentythirteen/taxonomy-post_format.php

@@ -21 +21 @@
         <?php if ( have_posts() ) : ?>
             <header class="archive-header">
-                <h1 class="archive-title"><?php printf( __( '%s Archives', 'twentythirteen' ), '<span>' . get_post_format_string( get_post_format() ) . '</span>' ); ?></h1>
+                <h1 class="archive-title"><?php printf( __( '%s Archives', 'twentythirteen' ), '<span>' . esc_html( get_post_format_string( get_post_format() ) ) . '</span>' ); ?></h1>
             </header><!-- .archive-header -->