Changeset 30074

Timestamp:

10/28/2014 09:11:11 PM (10 years ago)

Author:

johnbillion

Message:

Introduce a new means of outputting a <title> tag in the theme head. Requires a theme to add support by calling add_theme_support( 'title-tag' ). This is the first step in adding a more robust means of generating and outputting the title tag.

See #18548.
Props obenland, chrisbliss18, joostdevalk.

Location:

trunk/src/wp-includes

Files:

• default-filters.php (modified) (1 diff)
• general-template.php (modified) (3 diffs)
• theme.php (modified) (2 diffs)

trunk/src/wp-includes/default-filters.php

@@ -197 +197 @@
 
 // Actions
+add_action( 'wp_head',             '_wp_render_title_tag',            1     );
 add_action( 'wp_head',             'wp_enqueue_scripts',              1     );
 add_action( 'wp_head',             'feed_links',                      2     );

trunk/src/wp-includes/general-template.php

@@ -732 +732 @@
 
 /**
+ * Display <title> tag with contents.
+ *
+ * @since 4.1.0
+ * @access private
+ */
+function _wp_render_title_tag() {
+    if ( ! current_theme_supports( 'title-tag' ) ) {
+        return;
+    }
+
+    // This can only work internally on wp_head.
+    if ( ! did_action( 'wp_head' ) && ! doing_action( 'wp_head' ) ) {
+        return;
+    }
+
+    echo '<title>' . wp_title( '|', false, 'right' ) . "</title>\n";
+}
+
+/**
  * Display or retrieve page title for all areas of blog.
  *
@@ -754 +773 @@
  */
 function wp_title($sep = '&raquo;', $display = true, $seplocation = '') {
-    global $wp_locale;
+    global $wp_locale, $page, $paged;
 
     $m = get_query_var('m');
@@ -852 +871 @@
     } else {
         $title = $prefix . implode( " $sep ", $title_array );
+    }
+
+    if ( current_theme_supports( 'title-tag' ) && ! is_feed() ) {
+        $title .= get_bloginfo( 'name', 'display' );
+
+        $site_description = get_bloginfo( 'description', 'display' );
+        if ( $site_description && ( is_home() || is_front_page() ) ) {
+            $title .= " $sep $site_description";
+        }
+
+        if ( ( $paged >= 2 || $page >= 2 ) && ! is_404() ) {
+            $title .= " $sep " . sprintf( __( 'Page %s' ), max( $paged, $page ) );
+        }
     }
 

trunk/src/wp-includes/theme.php

@@ -1612 +1612 @@
 
             break;
+
+        // Ensure that 'title-tag' is accessible in the admin.
+        case 'title-tag' :
+            // Can be called in functions.php but must happen before wp_loaded, i.e. not in header.php.
+            if ( did_action( 'wp_loaded' ) ) {
+                _doing_it_wrong( "add_theme_support( 'title-tag' )", sprintf( _x( 'You need to add theme support before %s.', 'action name' ), '<code>wp_loaded</code>' ), '4.1.0' );
+
+                return false;
+            }
     }
 
@@ -1763 +1772 @@
     if ( !isset( $_wp_theme_features[$feature] ) )
         return false;
+
+    if ( 'title-tag' == $feature ) {
+        // Don't confirm support unless called internally.
+        $trace = debug_backtrace();
+        if ( ! in_array( $trace[1]['function'], array( '_wp_render_title_tag', 'wp_title' ) ) ) {
+            return false;
+        }
+    }
 
     // If no args passed then no extra checks need be performed