Changeset 28250

Timestamp:

05/04/2014 01:16:30 PM (11 years ago)

Author:

SergeyBiryukov

Message:

Prevent 'Page %s' from being added to page title on 404 error pages in bundled themes.

props psoluch, rob1n.
fixes #16468.

Location:

trunk/src/wp-content/themes

Files:

• twentyeleven/header.php (modified) (1 diff)
• twentyfourteen/functions.php (modified) (1 diff)
• twentyten/header.php (modified) (1 diff)
• twentythirteen/functions.php (modified) (1 diff)
• twentytwelve/functions.php (modified) (1 diff)

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

@@ -40 +40 @@
 
     // 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 ) );
 

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

@@ -485 +485 @@
 
     // 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 ) );
     }

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

@@ -30 +30 @@
 
     // 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 ) );
 

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

@@ -215 +215 @@
 
     // 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 ) );
 

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

@@ -210 +210 @@
 
     // 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 ) );