WordPress 4.0

[autoinstalls/wordpress.git] / wp-content / themes / twentytwelve / functions.php

diff --git a/wp-content/themes/twentytwelve/functions.php b/wp-content/themes/twentytwelve/functions.php
index c4055ba058550f32c6d1d502dc253e16d113adf6..38ea36ec7422f6357574db2845c36cf4007a035c 100644 (file)
--- a/wp-content/themes/twentytwelve/functions.php
+++ b/wp-content/themes/twentytwelve/functions.php
@@ -140,7 +140,7 @@ function twentytwelve_scripts_styles() {
                wp_enqueue_script( 'comment-reply' );
 
        // Adds JavaScript for handling the navigation menu hide-and-show behavior.
-       wp_enqueue_script( 'twentytwelve-navigation', get_template_directory_uri() . '/js/navigation.js', array( 'jquery' ), '20140318', true );
+       wp_enqueue_script( 'twentytwelve-navigation', get_template_directory_uri() . '/js/navigation.js', array( 'jquery' ), '20140711', true );
 
        $font_url = twentytwelve_get_font_url();
        if ( ! empty( $font_url ) )
@@ -209,7 +209,7 @@ function twentytwelve_wp_title( $title, $sep ) {
                $title = "$title $sep $site_description";
 
        // Add a page number if necessary.
-       if ( $paged >= 2 || $page >= 2 )
+       if ( ( $paged >= 2 || $page >= 2 ) && ! is_404() )
                $title = "$title $sep " . sprintf( __( 'Page %s', 'twentytwelve' ), max( $paged, $page ) );
 
        return $title;