From c0f1a4957597e12863c30411ee6ef3864bf9e70d Mon Sep 17 00:00:00 2001
From: John Blackbourn <johnbillion@git.wordpress.org>
Date: Fri, 7 Oct 2016 21:03:31 +0000
Subject: [PATCH] Themes: Remove `paged.php` from the theme template hierarchy.

The position of this template within the hierarchy is of so little use that zero themes in the WordPress.org theme directory make use of it. It's second only to `index.php` in the hierarchy, meaning that any archive template such as `category.php` or `archive.php` will be chosen before it.

Fixes #38162
Props ryankienstra for initial patch

Built from https://develop.svn.wordpress.org/trunk@38755


git-svn-id: http://core.svn.wordpress.org/trunk@38698 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/deprecated.php      | 14 ++++++++++++++
 wp-includes/template-loader.php |  1 -
 wp-includes/template.php        | 16 ----------------
 wp-includes/version.php         |  2 +-
 4 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/wp-includes/deprecated.php b/wp-includes/deprecated.php
index db2a7d7e5c..8315702bab 100644
--- a/wp-includes/deprecated.php
+++ b/wp-includes/deprecated.php
@@ -3758,3 +3758,17 @@ function wp_embed_handler_googlevideo( $matches, $attr, $url, $rawattr ) {
 
 	return '';
 }
+
+/**
+ * Retrieve path of paged template in current or parent template.
+ *
+ * @since 1.5.0
+ * @deprecated 4.7.0 The paged.php template is no longer part of the theme template heirarchy.
+ *
+ * @return string Full path to paged template file.
+ */
+function get_paged_template() {
+	_deprecated_function( __FUNCTION__, '4.7.0' );
+
+	return get_query_template( 'paged' );
+}
diff --git a/wp-includes/template-loader.php b/wp-includes/template-loader.php
index 025f1a8479..1ee7c222c1 100644
--- a/wp-includes/template-loader.php
+++ b/wp-includes/template-loader.php
@@ -60,7 +60,6 @@ if ( defined('WP_USE_THEMES') && WP_USE_THEMES ) :
 	elseif ( is_author()         && $template = get_author_template()         ) :
 	elseif ( is_date()           && $template = get_date_template()           ) :
 	elseif ( is_archive()        && $template = get_archive_template()        ) :
-	elseif ( is_paged()          && $template = get_paged_template()          ) :
 	else :
 		$template = get_index_template();
 	endif;
diff --git a/wp-includes/template.php b/wp-includes/template.php
index 946732fac6..2a03a99e71 100644
--- a/wp-includes/template.php
+++ b/wp-includes/template.php
@@ -381,22 +381,6 @@ function get_page_template() {
 	return get_query_template( 'page', $templates );
 }
 
-/**
- * Retrieve path of paged template in current or parent template.
- *
- * The template hierarchy is filterable via the {@see 'paged_template_hierarchy'} hook.
- * The template path is filterable via the {@see 'paged_template'} hook.
- *
- * @since 1.5.0
- *
- * @see get_query_template()
- *
- * @return string Full path to paged template file.
- */
-function get_paged_template() {
-	return get_query_template('paged');
-}
-
 /**
  * Retrieve path of search template in current or parent template.
  *
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 15407c8b9b..ca81ee381f 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.7-alpha-38754';
+$wp_version = '4.7-alpha-38755';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.