<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[27470] trunk/src: Rename the new page_templates filter to theme_page_templates, and pass it a post object for proper context.</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/27470">27470</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2014-03-08 04:18:30 +0000 (Sat, 08 Mar 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>Rename the new page_templates filter to theme_page_templates, and pass it a post object for proper context.

see <a href="http://core.trac.wordpress.org/ticket/13265">#13265</a>.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesmetaboxesphp">trunk/src/wp-admin/includes/meta-boxes.php</a></li>
<li><a href="#trunksrcwpadminincludestemplatephp">trunk/src/wp-admin/includes/template.php</a></li>
<li><a href="#trunksrcwpadminincludesthemephp">trunk/src/wp-admin/includes/theme.php</a></li>
<li><a href="#trunksrcwpincludesclasswpthemephp">trunk/src/wp-includes/class-wp-theme.php</a></li>
<li><a href="#trunksrcwpincludespostphp">trunk/src/wp-includes/post.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesmetaboxesphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/meta-boxes.php (27469 => 27470)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/meta-boxes.php       2014-03-08 04:13:28 UTC (rev 27469)
+++ trunk/src/wp-admin/includes/meta-boxes.php  2014-03-08 04:18:30 UTC (rev 27470)
</span><span class="lines">@@ -705,7 +705,7 @@
</span><span class="cx"> <?php
</span><span class="cx">          } // end empty pages check
</span><span class="cx">  } // end hierarchical check.
</span><del>-       if ( 'page' == $post->post_type && 0 != count( get_page_templates() ) ) {
</del><ins>+        if ( 'page' == $post->post_type && 0 != count( get_page_templates( $post ) ) ) {
</ins><span class="cx">           $template = !empty($post->page_template) ? $post->page_template : false;
</span><span class="cx">          ?>
</span><span class="cx"> <p><strong><?php _e('Template') ?></strong></p>
</span></span></pre></div>
<a id="trunksrcwpadminincludestemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/template.php (27469 => 27470)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/template.php 2014-03-08 04:13:28 UTC (rev 27469)
+++ trunk/src/wp-admin/includes/template.php    2014-03-08 04:18:30 UTC (rev 27470)
</span><span class="lines">@@ -741,7 +741,7 @@
</span><span class="cx">  * @param string $default Optional. The template file name. Default empty.
</span><span class="cx">  */
</span><span class="cx"> function page_template_dropdown( $default = '' ) {
</span><del>-       $templates = get_page_templates();
</del><ins>+        $templates = get_page_templates( get_post() );
</ins><span class="cx">   ksort( $templates );
</span><span class="cx">  foreach ( array_keys( $templates ) as $template ) {
</span><span class="cx">          $selected = selected( $default, $templates[ $template ], false );
</span></span></pre></div>
<a id="trunksrcwpadminincludesthemephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/theme.php (27469 => 27470)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/theme.php    2014-03-08 04:13:28 UTC (rev 27469)
+++ trunk/src/wp-admin/includes/theme.php       2014-03-08 04:18:30 UTC (rev 27470)
</span><span class="lines">@@ -78,10 +78,11 @@
</span><span class="cx">  *
</span><span class="cx">  * @since 1.5.0
</span><span class="cx">  *
</span><ins>+ * @param WP_Post|null $post Optional. The post being edited, provided for context.
</ins><span class="cx">  * @return array Key is the template name, value is the filename of the template
</span><span class="cx">  */
</span><del>-function get_page_templates() {
-       return array_flip( wp_get_theme()->get_page_templates() );
</del><ins>+function get_page_templates( $post = null ) {
+       return array_flip( wp_get_theme()->get_page_templates( $post ) );
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> /**
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpthemephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/class-wp-theme.php (27469 => 27470)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/class-wp-theme.php 2014-03-08 04:13:28 UTC (rev 27469)
+++ trunk/src/wp-includes/class-wp-theme.php    2014-03-08 04:18:30 UTC (rev 27470)
</span><span class="lines">@@ -931,9 +931,10 @@
</span><span class="cx">   * @since 3.4.0
</span><span class="cx">   * @access public
</span><span class="cx">   *
</span><ins>+        * @param WP_Post|null $post Optional. The post being edited, provided for context.
</ins><span class="cx">    * @return array Array of page templates, keyed by filename, with the value of the translated header name.
</span><span class="cx">   */
</span><del>-       public function get_page_templates() {
</del><ins>+        public function get_page_templates( $post = null ) {
</ins><span class="cx">           // If you screw up your current theme and we invalidate your parent, most things still work. Let it slide.
</span><span class="cx">          if ( $this->errors() && $this->errors()->get_error_codes() !== array( 'theme_parent_invalid' ) )
</span><span class="cx">                  return array();
</span><span class="lines">@@ -961,7 +962,7 @@
</span><span class="cx">          }
</span><span class="cx"> 
</span><span class="cx">          if ( $this->parent() )
</span><del>-                       $page_templates += $this->parent()->get_page_templates();
</del><ins>+                        $page_templates += $this->parent()->get_page_templates( $post );
</ins><span class="cx"> 
</span><span class="cx">          /**
</span><span class="cx">           * Remove or rename page templates for a theme.
</span><span class="lines">@@ -970,11 +971,13 @@
</span><span class="cx">           *
</span><span class="cx">           * @since 3.9.0
</span><span class="cx">           *
</span><del>-                * @param array    $page_templates Array of page templates. Keys are filenames,
-                *                                 values are translated names.
-                * @param WP_Theme $this           The theme object.
</del><ins>+                 * @param array        $page_templates Array of page templates. Keys are filenames,
+                *                                     values are translated names.
+                * @param WP_Theme     $this           The theme object.
+                * @param WP_Post|null $post           The post being edited, provided for context, or null.
</ins><span class="cx">            */
</span><del>-               $return = apply_filters( 'page_templates', $page_templates, $this );
</del><ins>+                error_log( serialize( $this ) );
+               $return = apply_filters( 'theme_page_templates', $page_templates, $this, $post );
</ins><span class="cx">           return array_intersect_assoc( $return, $page_templates );
</span><span class="cx">  }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunksrcwpincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/post.php (27469 => 27470)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/post.php   2014-03-08 04:13:28 UTC (rev 27469)
+++ trunk/src/wp-includes/post.php      2014-03-08 04:18:30 UTC (rev 27470)
</span><span class="lines">@@ -2948,7 +2948,7 @@
</span><span class="cx"> 
</span><span class="cx">  if ( !empty($page_template) && 'page' == $data['post_type'] ) {
</span><span class="cx">          $post->page_template = $page_template;
</span><del>-               $page_templates = wp_get_theme()->get_page_templates();
</del><ins>+                $page_templates = wp_get_theme()->get_page_templates( $post );
</ins><span class="cx">           if ( 'default' != $page_template && ! isset( $page_templates[ $page_template ] ) ) {
</span><span class="cx">                  if ( $wp_error )
</span><span class="cx">                          return new WP_Error('invalid_page_template', __('The page template is invalid.'));
</span></span></pre>
</div>
</div>

</body>
</html>