diff --git a/functions.php b/functions.php
index 537ff62..9eb22bf 100644
--- a/functions.php
+++ b/functions.php
@@ -33,6 +33,14 @@ function _s_setup() {
// Add default posts and comments RSS feed links to head.
add_theme_support( 'automatic-feed-links' );
+ /*
+ * Let WordPress manage the document title.
+ * By adding theme support, we declare that this theme does not use a
+ * hard-coded tag in the document head, and expect WordPress to
+ * provide it for us.
+ */
+ add_theme_support( 'title-tag' );
+
/*
* Enable support for Post Thumbnails on posts and pages.
*
diff --git a/header.php b/header.php
index ee7a393..185274e 100644
--- a/header.php
+++ b/header.php
@@ -11,7 +11,6 @@
<head>
<meta charset="<?php bloginfo( 'charset' ); ?>">
<meta name="viewport" content="width=device-width, initial-scale=1">
-<title><?php wp_title( '|', true, 'right' ); ?>
diff --git a/inc/extras.php b/inc/extras.php
index 531c777..99b49d8 100644
--- a/inc/extras.php
+++ b/inc/extras.php
@@ -35,37 +35,52 @@ function _s_body_classes( $classes ) {
}
add_filter( 'body_class', '_s_body_classes' );
-/**
- * Filters wp_title to print a neat tag based on what is being viewed.
- *
- * @param string $title Default title text for current view.
- * @param string $sep Optional separator.
- * @return string The filtered title.
- */
-function _s_wp_title( $title, $sep ) {
- if ( is_feed() ) {
+if ( ! function_exists( '_wp_render_title_tag' ) ) :
+ /**
+ * Filters wp_title to print a neat <title> tag based on what is being viewed.
+ *
+ * @param string $title Default title text for current view.
+ * @param string $sep Optional separator.
+ * @return string The filtered title.
+ */
+ function _s_wp_title( $title, $sep ) {
+ if ( is_feed() ) {
+ return $title;
+ }
+
+ global $page, $paged;
+
+ // Add the blog name
+ $title .= get_bloginfo( 'name', 'display' );
+
+ // Add the blog description for the home/front page.
+ $site_description = get_bloginfo( 'description', 'display' );
+ if ( $site_description && ( is_home() || is_front_page() ) ) {
+ $title .= " $sep $site_description";
+ }
+
+ // Add a page number if necessary:
+ if ( ( $paged >= 2 || $page >= 2 ) && ! is_404() ) {
+ $title .= " $sep " . sprintf( __( 'Page %s', '_s' ), max( $paged, $page ) );
+ }
+
return $title;
}
+ add_filter( 'wp_title', '_s_wp_title', 10, 2 );
+endif;
- global $page, $paged;
-
- // Add the blog name
- $title .= get_bloginfo( 'name', 'display' );
-
- // Add the blog description for the home/front page.
- $site_description = get_bloginfo( 'description', 'display' );
- if ( $site_description && ( is_home() || is_front_page() ) ) {
- $title .= " $sep $site_description";
+if ( ! function_exists( '_wp_render_title_tag' ) ) :
+ /**
+ * Title shim for sites older than WordPress 4.1.
+ *
+ * @link https://make.wordpress.org/core/2014/10/29/title-tags-in-4-1/
+ * @todo Remove this function when WordPress 4.3 is released.
+ */
+ function _s_render_title() {
+ echo '<title>' . wp_title( '|', false, 'right' ) . "\n";
}
-
- // Add a page number if necessary:
- if ( ( $paged >= 2 || $page >= 2 ) && ! is_404() ) {
- $title .= " $sep " . sprintf( __( 'Page %s', '_s' ), max( $paged, $page ) );
- }
-
- return $title;
-}
-add_filter( 'wp_title', '_s_wp_title', 10, 2 );
+ add_action( 'wp_head', '_s_render_title' );
+endif;
/**
* Sets the authordata global when viewing an author archive.