Ticket #58102: 58102-twentyfourteen.diff

src/wp-content/themes/twentyfourteen/404.php

@@ -14 +14 @@
                 <div id="content" class="site-content" role="main">
 
                         <header class="page-header">
-                                <h1 class="page-title"><?php _e( 'Not Found', 'twentyfourteen' ); ?></h1>
+                                <h1 class="page-title"><?php esc_html_e( 'Not Found', 'twentyfourteen' ); ?></h1>
                         </header>
 
                         <div class="page-content">
-                                <p><?php _e( 'It looks like nothing was found at this location. Maybe try a search?', 'twentyfourteen' ); ?></p>
+                                <p><?php esc_html_e( 'It looks like nothing was found at this location. Maybe try a search?', 'twentyfourteen' ); ?></p>
 
                                 <?php get_search_form(); ?>
                         </div><!-- .page-content -->

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

@@ -50 +50 @@
                 <h1 class="screen-reader-text">
                         <?php
                         /* translators: Hidden accessibility text. */
-                        _e( 'Comment navigation', 'twentyfourteen' );
+                        esc_html_e( 'Comment navigation', 'twentyfourteen' );
                         ?>
                 </h1>
                 <div class="nav-previous"><?php previous_comments_link( __( '&larr; Older Comments', 'twentyfourteen' ) ); ?></div>
@@ -75 +75 @@
                 <h1 class="screen-reader-text">
                         <?php
                         /* translators: Hidden accessibility text. */
-                        _e( 'Comment navigation', 'twentyfourteen' );
+                        esc_html_e( 'Comment navigation', 'twentyfourteen' );
                         ?>
                 </h1>
                 <div class="nav-previous"><?php previous_comments_link( __( '&larr; Older Comments', 'twentyfourteen' ) ); ?></div>
@@ -84 +84 @@
         <?php endif; // Check for comment navigation. ?>
 
                 <?php if ( ! comments_open() ) : ?>
-        <p class="no-comments"><?php _e( 'Comments are closed.', 'twentyfourteen' ); ?></p>
+        <p class="no-comments"><?php esc_html_e( 'Comments are closed.', 'twentyfourteen' ); ?></p>
         <?php endif; ?>
 
-        <?php endif; // have_comments() ?>
+        <?php endif; ?>
 
         <?php comment_form(); ?>
 

src/wp-content/themes/twentyfourteen/content-none.php

@@ -9 +9 @@
 ?>
 
 <header class="page-header">
-        <h1 class="page-title"><?php _e( 'Nothing Found', 'twentyfourteen' ); ?></h1>
+        <h1 class="page-title"><?php esc_html_e( 'Nothing Found', 'twentyfourteen' ); ?></h1>
 </header>
 
 <div class="page-content">
@@ -24 +24 @@
 
         <?php elseif ( is_search() ) : ?>
 
-        <p><?php _e( 'Sorry, but nothing matched your search terms. Please try again with some different keywords.', 'twentyfourteen' ); ?></p>
+        <p><?php esc_html_e( 'Sorry, but nothing matched your search terms. Please try again with some different keywords.', 'twentyfourteen' ); ?></p>
                 <?php get_search_form(); ?>
 
         <?php else : ?>
 
-        <p><?php _e( 'It seems we can&rsquo;t find what you&rsquo;re looking for. Perhaps searching can help.', 'twentyfourteen' ); ?></p>
+        <p><?php esc_html_e( 'It seems we can&rsquo;t find what you&rsquo;re looking for. Perhaps searching can help.', 'twentyfourteen' ); ?></p>
                 <?php get_search_form(); ?>
 
         <?php endif; ?>

src/wp-content/themes/twentyfourteen/functions.php

@@ -212 +212 @@
                 // Indicate widget sidebars can use selective refresh in the Customizer.
                 add_theme_support( 'customize-selective-refresh-widgets' );
         }
-endif; // twentyfourteen_setup()
+endif;
 add_action( 'after_setup_theme', 'twentyfourteen_setup' );
 
 /**

src/wp-content/themes/twentyfourteen/header.php

@@ -24 +24 @@
         <title><?php wp_title( '|', true, 'right' ); ?></title>
         <link rel="profile" href="https://gmpg.org/xfn/11">
         <link rel="pingback" href="<?php echo esc_url( get_bloginfo( 'pingback_url' ) ); ?>">
-        <!--[if lt IE 9]>
-        <script src="<?php echo esc_url( get_template_directory_uri() ); ?>/js/html5.js?ver=3.7.0"></script>
-        <![endif]-->
         <?php wp_head(); ?>
 </head>
 
@@ -36 +33 @@
         <?php if ( get_header_image() ) : ?>
         <div id="site-header">
                 <a href="<?php echo esc_url( home_url( '/' ) ); ?>" rel="home">
-                        <img src="<?php header_image(); ?>" width="<?php echo get_custom_header()->width; ?>" height="<?php echo get_custom_header()->height; ?>" alt="<?php echo esc_attr( get_bloginfo( 'name', 'display' ) ); ?>" />
+                        <img src="<?php header_image(); ?>" width="<?php echo esc_attr( get_custom_header()->width ); ?>" height="<?php echo esc_attr( get_custom_header()->height ); ?>" alt="<?php echo esc_attr( get_bloginfo( 'name', 'display' ) ); ?>" />
                 </a>
         </div>
         <?php endif; ?>
@@ -49 +46 @@
                                 <a href="#search-container" class="screen-reader-text" aria-expanded="false" aria-controls="search-container">
                                         <?php
                                         /* translators: Hidden accessibility text. */
-                                        _e( 'Search', 'twentyfourteen' );
+                                        esc_html_e( 'Search', 'twentyfourteen' );
                                         ?>
                                 </a>
                         </div>
 
                         <nav id="primary-navigation" class="site-navigation primary-navigation">
-                                <button class="menu-toggle"><?php _e( 'Primary Menu', 'twentyfourteen' ); ?></button>
+                                <button class="menu-toggle"><?php esc_html_e( 'Primary Menu', 'twentyfourteen' ); ?></button>
                                 <a class="screen-reader-text skip-link" href="#content">
                                         <?php
                                         /* translators: Hidden accessibility text. */
-                                        _e( 'Skip to content', 'twentyfourteen' );
+                                        esc_html_e( 'Skip to content', 'twentyfourteen' );
                                         ?>
                                 </a>
                                 <?php

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

@@ -9 +9 @@
 
 // Retrieve attachment metadata.
 $metadata = wp_get_attachment_metadata();
+global $post;
 
 get_header();
 ?>

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

@@ -91 +91 @@
         </style>
                 <?php
         }
-endif; // twentyfourteen_header_style()
+endif;
 
 
 if ( ! function_exists( 'twentyfourteen_admin_header_style' ) ) :
@@ -130 +130 @@
         </style>
                 <?php
         }
-endif; // twentyfourteen_admin_header_style()
+endif;
 
 if ( ! function_exists( 'twentyfourteen_admin_header_image' ) ) :
         /**
@@ -150 +150 @@
         </div>
                 <?php
         }
-endif; // twentyfourteen_admin_header_image()
+endif;

src/wp-content/themes/twentyfourteen/taxonomy-post_format.php

@@ -27 +27 @@
                                 <h1 class="archive-title">
                                         <?php
                                         if ( is_tax( 'post_format', 'post-format-aside' ) ) :
-                                                _e( 'Asides', 'twentyfourteen' );
+                                                esc_html_e( 'Asides', 'twentyfourteen' );
 
                                                 elseif ( is_tax( 'post_format', 'post-format-image' ) ) :
-                                                        _e( 'Images', 'twentyfourteen' );
+                                                        esc_html_e( 'Images', 'twentyfourteen' );
 
                                                 elseif ( is_tax( 'post_format', 'post-format-video' ) ) :
-                                                        _e( 'Videos', 'twentyfourteen' );
+                                                        esc_html_e( 'Videos', 'twentyfourteen' );
 
                                                 elseif ( is_tax( 'post_format', 'post-format-audio' ) ) :
-                                                        _e( 'Audio', 'twentyfourteen' );
+                                                        esc_html_e( 'Audio', 'twentyfourteen' );
 
                                                 elseif ( is_tax( 'post_format', 'post-format-quote' ) ) :
-                                                        _e( 'Quotes', 'twentyfourteen' );
+                                                        esc_html_e( 'Quotes', 'twentyfourteen' );
 
                                                 elseif ( is_tax( 'post_format', 'post-format-link' ) ) :
-                                                        _e( 'Links', 'twentyfourteen' );
+                                                        esc_html_e( 'Links', 'twentyfourteen' );
 
                                                 elseif ( is_tax( 'post_format', 'post-format-gallery' ) ) :
-                                                        _e( 'Galleries', 'twentyfourteen' );
+                                                        esc_html_e( 'Galleries', 'twentyfourteen' );
 
                                                 else :
-                                                        _e( 'Archives', 'twentyfourteen' );
+                                                        esc_html_e( 'Archives', 'twentyfourteen' );
 
                                                 endif;
                                                 ?>