WordPress 3.4.2

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

diff --git a/wp-content/themes/twentyten/header.php b/wp-content/themes/twentyten/header.php
index fbd248605585cc6fa4a28df2a80e167620e9da8f..50cb37589dc806432f5c03efe79aaaad3b22567e 100644 (file)
--- a/wp-content/themes/twentyten/header.php
+++ b/wp-content/themes/twentyten/header.php
@@ -15,11 +15,23 @@
 <title><?php
        /*
         * Print the <title> tag based on what is being viewed.
-        * We filter the output of wp_title() a bit -- see
-        * twentyten_filter_wp_title() in functions.php.
         */
+       global $page, $paged;
+
        wp_title( '|', true, 'right' );
 
+       // Add the blog name.
+       bloginfo( 'name' );
+
+       // Add the blog description for the home/front page.
+       $site_description = get_bloginfo( 'description', 'display' );
+       if ( $site_description && ( is_home() || is_front_page() ) )
+               echo " | $site_description";
+
+       // Add a page number if necessary:
+       if ( $paged >= 2 || $page >= 2 )
+               echo ' | ' . sprintf( __( 'Page %s', 'twentyten' ), max( $paged, $page ) );
+
        ?></title>
 <link rel="profile" href="http://gmpg.org/xfn/11" />
 <link rel="stylesheet" type="text/css" media="all" href="<?php bloginfo( 'stylesheet_url' ); ?>" />
@@ -54,22 +66,40 @@
                                <div id="site-description"><?php bloginfo( 'description' ); ?></div>
 
                                <?php
+                                       // Compatibility with versions of WordPress prior to 3.4.
+                                       if ( function_exists( 'get_custom_header' ) ) {
+                                               // We need to figure out what the minimum width should be for our featured image.
+                                               // This result would be the suggested width if the theme were to implement flexible widths.
+                                               $header_image_width = get_theme_support( 'custom-header', 'width' );
+                                       } else {
+                                               $header_image_width = HEADER_IMAGE_WIDTH;
+                                       }
+
                                        // Check if this is a post or page, if it has a thumbnail, and if it's a big one
-                                       if ( is_singular() &&
+                                       if ( is_singular() && current_theme_supports( 'post-thumbnails' ) &&
                                                        has_post_thumbnail( $post->ID ) &&
                                                        ( /* $src, $width, $height */ $image = wp_get_attachment_image_src( get_post_thumbnail_id( $post->ID ), 'post-thumbnail' ) ) &&
-                                                       $image[1] >= HEADER_IMAGE_WIDTH ) :
+                                                       $image[1] >= $header_image_width ) :
                                                // Houston, we have a new header image!
-                                               echo get_the_post_thumbnail( $post->ID, 'post-thumbnail' );
-                                       else : ?>
-                                               <img src="<?php header_image(); ?>" width="<?php echo HEADER_IMAGE_WIDTH; ?>" height="<?php echo HEADER_IMAGE_HEIGHT; ?>" alt="" />
+                                               echo get_the_post_thumbnail( $post->ID );
+                                       elseif ( get_header_image() ) :
+                                               // Compatibility with versions of WordPress prior to 3.4.
+                                               if ( function_exists( 'get_custom_header' ) ) {
+                                                       $header_image_width  = get_custom_header()->width;
+                                                       $header_image_height = get_custom_header()->height;
+                                               } else {
+                                                       $header_image_width  = HEADER_IMAGE_WIDTH;
+                                                       $header_image_height = HEADER_IMAGE_HEIGHT;
+                                               }
+                                       ?>
+                                               <img src="<?php header_image(); ?>" width="<?php echo $header_image_width; ?>" height="<?php echo $header_image_height; ?>" alt="" />
                                        <?php endif; ?>
                        </div><!-- #branding -->
 
                        <div id="access" role="navigation">
-                         <?php /*  Allow screen readers / text browsers to skip the navigation menu and get right to the good stuff */ ?>
+                         <?php /* Allow screen readers / text browsers to skip the navigation menu and get right to the good stuff */ ?>
                                <div class="skip-link screen-reader-text"><a href="#content" title="<?php esc_attr_e( 'Skip to content', 'twentyten' ); ?>"><?php _e( 'Skip to content', 'twentyten' ); ?></a></div>
-                               <?php /* Our navigation menu.  If one isn't filled out, wp_nav_menu falls back to wp_page_menu.  The menu assiged to the primary position is the one used.  If none is assigned, the menu with the lowest ID is used.  */ ?>
+                               <?php /* Our navigation menu. If one isn't filled out, wp_nav_menu falls back to wp_page_menu. The menu assiged to the primary position is the one used. If none is assigned, the menu with the lowest ID is used. */ ?>
                                <?php wp_nav_menu( array( 'container_class' => 'menu-header', 'theme_location' => 'primary' ) ); ?>
                        </div><!-- #access -->
                </div><!-- #masthead -->