WordPress 4.5

[autoinstalls/wordpress.git] / wp-content / themes / twentysixteen / header.php

diff --git a/wp-content/themes/twentysixteen/header.php b/wp-content/themes/twentysixteen/header.php
index f20e130eef8a16ed8b859f60a1daaddd0b1f7635..d230c4f8db0e84b444d5c7ccec97a7b486ca9b39 100644 (file)
--- a/wp-content/themes/twentysixteen/header.php
+++ b/wp-content/themes/twentysixteen/header.php
@@ -29,6 +29,8 @@
                <header id="masthead" class="site-header" role="banner">
                        <div class="site-header-main">
                                <div class="site-branding">
+                                       <?php twentysixteen_the_custom_logo(); ?>
+
                                        <?php if ( is_front_page() && is_home() ) : ?>
                                                <h1 class="site-title"><a href="<?php echo esc_url( home_url( '/' ) ); ?>" rel="home"><?php bloginfo( 'name' ); ?></a></h1>
                                        <?php else : ?>
@@ -46,7 +48,7 @@
 
                                        <div id="site-header-menu" class="site-header-menu">
                                                <?php if ( has_nav_menu( 'primary' ) ) : ?>
-                                                       <nav id="site-navigation" class="main-navigation" role="navigation" aria-label="<?php _e( 'Primary Menu', 'twentysixteen' ); ?>">
+                                                       <nav id="site-navigation" class="main-navigation" role="navigation" aria-label="<?php esc_attr_e( 'Primary Menu', 'twentysixteen' ); ?>">
                                                                <?php
                                                                        wp_nav_menu( array(
                                                                                'theme_location' => 'primary',
@@ -57,7 +59,7 @@
                                                <?php endif; ?>
 
                                                <?php if ( has_nav_menu( 'social' ) ) : ?>
-                                                       <nav id="social-navigation" class="social-navigation" role="navigation" aria-label="<?php _e( 'Social Links Menu', 'twentysixteen' ); ?>">
+                                                       <nav id="social-navigation" class="social-navigation" role="navigation" aria-label="<?php esc_attr_e( 'Social Links Menu', 'twentysixteen' ); ?>">
                                                                <?php
                                                                        wp_nav_menu( array(
                                                                                'theme_location' => 'social',
@@ -90,7 +92,7 @@
                                        <a href="<?php echo esc_url( home_url( '/' ) ); ?>" rel="home">
                                                <img src="<?php header_image(); ?>" srcset="<?php echo esc_attr( wp_get_attachment_image_srcset( get_custom_header()->attachment_id ) ); ?>" sizes="<?php echo esc_attr( $custom_header_sizes ); ?>" 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>
+                               </div><!-- .header-image -->
                        <?php endif; // End header image check. ?>
                </header><!-- .site-header -->