WordPress 4.0

[autoinstalls/wordpress.git] / wp-content / themes / twentytwelve / header.php
diff --git a/wp-content/themes/twentytwelve/header.php b/wp-content/themes/twentytwelve/header.php

index 2d3dfa630f9a78f82c227ea496a914cbee28ba28..8dcd9a99eddeacf3311f6769ff3f213def8665e3 100644 (file)
--- a/wp-content/themes/twentytwelve/header.php
+++ b/wp-content/themes/twentytwelve/header.php
@@ -1,6 +1,6 @@
  <?php
  /**
- * The Header for our theme.
+ * The Header template for our theme
   *
   * Displays all of the <head> section and everything up till <div id="main">
   *
@@ -15,7 +15,7 @@
  <!--[if IE 8]>
  <html class="ie ie8" <?php language_attributes(); ?>>
  <![endif]-->
-<!--[if !(IE 7) | !(IE 8)  ]><!-->
+<!--[if !(IE 7) & !(IE 8)]><!-->
  <html <?php language_attributes(); ?>>
  <!--<![endif]-->
  <head>
@@ -40,14 +40,13 @@
                 </hgroup>
  
                 <nav id="site-navigation" class="main-navigation" role="navigation">
-                       <h3 class="menu-toggle"><?php _e( 'Menu', 'twentytwelve' ); ?></h3>
+                       <button class="menu-toggle"><?php _e( 'Menu', 'twentytwelve' ); ?></button>
                         <a class="assistive-text" href="#content" title="<?php esc_attr_e( 'Skip to content', 'twentytwelve' ); ?>"><?php _e( 'Skip to content', 'twentytwelve' ); ?></a>
                         <?php wp_nav_menu( array( 'theme_location' => 'primary', 'menu_class' => 'nav-menu' ) ); ?>
                 </nav><!-- #site-navigation -->
  
-               <?php $header_image = get_header_image();
-               if ( ! empty( $header_image ) ) : ?>
-                       <a href="<?php echo esc_url( home_url( '/' ) ); ?>"><img src="<?php echo esc_url( $header_image ); ?>" class="header-image" width="<?php echo get_custom_header()->width; ?>" height="<?php echo get_custom_header()->height; ?>" alt="" /></a>
+               <?php if ( get_header_image() ) : ?>
+               <a href="<?php echo esc_url( home_url( '/' ) ); ?>"><img src="<?php header_image(); ?>" class="header-image" width="<?php echo get_custom_header()->width; ?>" height="<?php echo get_custom_header()->height; ?>" alt="" /></a>
                 <?php endif; ?>
         </header><!-- #masthead -->