Ticket #16468: 404.patch

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

@@ -35 +35 @@
 
         // Add the blog description for the home/front page.
         $site_description = get_bloginfo( 'description', 'display' );
-        if ( $site_description && ( is_home() || is_front_page() ) )
+        if ( $site_description && ( is_home() || is_front_page() ) ) {
                 echo " | $site_description";
-
+        }
+        
         // Add a page number if necessary:
-        if ( $paged >= 2 || $page >= 2 )
+        if ( ( $paged >= 2 || $page >= 2 ) && ! is_404() ) {
                 echo ' | ' . sprintf( __( 'Page %s', 'twentyeleven' ), max( $paged, $page ) );
+        }
 
         ?></title>
 <link rel="profile" href="http://gmpg.org/xfn/11" />

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

@@ -484 +484 @@
         }
 
         // Add a page number if necessary.
-        if ( $paged >= 2 || $page >= 2 ) {
+        if ( ( $paged >= 2 || $page >= 2 ) && ! is_404() ) {
                 $title = "$title $sep " . sprintf( __( 'Page %s', 'twentyfourteen' ), max( $paged, $page ) );
         }
 

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

@@ -25 +25 @@
 
         // Add the blog description for the home/front page.
         $site_description = get_bloginfo( 'description', 'display' );
-        if ( $site_description && ( is_home() || is_front_page() ) )
+        if ( $site_description && ( is_home() || is_front_page() ) ) {
                 echo " | $site_description";
+        }
 
         // Add a page number if necessary:
-        if ( $paged >= 2 || $page >= 2 )
+        if ( ( $paged >= 2 || $page >= 2 ) && ! is_404() ) {
                 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' ); ?>" />

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

@@ -210 +210 @@
 
         // Add the site description for the home/front page.
         $site_description = get_bloginfo( 'description', 'display' );
-        if ( $site_description && ( is_home() || is_front_page() ) )
+        if ( $site_description && ( is_home() || is_front_page() ) ) {
                 $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', 'twentythirteen' ), max( $paged, $page ) );
-
+        }
+        
         return $title;
 }
 add_filter( 'wp_title', 'twentythirteen_wp_title', 10, 2 );

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

@@ -205 +205 @@
 
         // Add the site description for the home/front page.
         $site_description = get_bloginfo( 'description', 'display' );
-        if ( $site_description && ( is_home() || is_front_page() ) )
+        if ( $site_description && ( is_home() || is_front_page() ) ) {
                 $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;
 }