<!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>[20327] trunk/wp-includes/class-wp-theme.php: Set WP_Theme::scandir()'s default depth to 0 (flat), as intended.</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, #logmsg > ol { margin-left: 0; 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/20327">20327</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2012-03-30 14:06:33 +0000 (Fri, 30 Mar 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Set WP_Theme::scandir()'s default depth to 0 (flat), as intended. Cache untranslated page template names. Properly merge in a parent theme's templates when dealing with cached values. Always look one level deep for WP_Theme->get_files() regardless of file type. see <a href="http://core.trac.wordpress.org/ticket/20103">#20103</a>. see <a href="http://core.trac.wordpress.org/ticket/11216">#11216</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesclasswpthemephp">trunk/wp-includes/class-wp-theme.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesclasswpthemephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/class-wp-theme.php (20326 => 20327)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class-wp-theme.php 2012-03-30 13:10:52 UTC (rev 20326)
+++ trunk/wp-includes/class-wp-theme.php 2012-03-30 14:06:33 UTC (rev 20327)
</span><span class="lines">@@ -396,9 +396,9 @@
</span><span class="cx"> case 'Stylesheet' :
</span><span class="cx"> return $this->get_stylesheet();
</span><span class="cx"> case 'Template Files' :
</span><del>- $files = $this->get_files( 'php', 1 );
</del><ins>+ $files = $this->get_files( 'php' );
</ins><span class="cx"> if ( $this->parent() )
</span><del>- $files = array_merge( $files, $this->parent()->get_files( 'php', 1 ) );
</del><ins>+ $files = array_merge( $files, $this->parent()->get_files( 'php' ) );
</ins><span class="cx"> return $files;
</span><span class="cx"> case 'Stylesheet Files' :
</span><span class="cx"> $files = $this->get_files( 'css' );
</span><span class="lines">@@ -961,13 +961,12 @@
</span><span class="cx"> * @return array If a specific $type is requested, returns an array of PHP files. If no $type is requested,
</span><span class="cx"> * returns an array, with the keys being the file types, and the values being an array of files for those type.
</span><span class="cx"> */
</span><del>- public function get_files( $type = null, $depth = 0 ) {
</del><ins>+ public function get_files( $type ) {
</ins><span class="cx"> $files = $this->cache_get( 'files' );
</span><span class="cx"> if ( ! is_array( $files ) ) {
</span><del>- $files = (array) self::scandir( $this->get_stylesheet_directory(), array( 'php', 'css' ), $depth );
</del><ins>+ $files = (array) self::scandir( $this->get_stylesheet_directory(), array( 'php', 'css' ), 1 );
</ins><span class="cx"> foreach ( $files as &$group )
</span><span class="cx"> ksort( $group );
</span><del>- unset( $group );
</del><span class="cx"> $this->cache_add( 'files', $files );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -993,20 +992,27 @@
</span><span class="cx"> return array();
</span><span class="cx">
</span><span class="cx"> $page_templates = $this->cache_get( 'page_templates' );
</span><del>- if ( is_array( $page_templates ) )
- return $page_templates;
- $page_templates = array();
</del><span class="cx">
</span><del>- $files = (array) self::scandir( $this->get_stylesheet_directory(), 'php', 1 );
</del><ins>+ if ( ! is_array( $page_templates ) ) {
+ $page_templates = array();
</ins><span class="cx">
</span><del>- foreach ( $files['php'] as $file => $full_path ) {
- $headers = get_file_data( $full_path, array( 'Template Name' => 'Template Name' ) );
- if ( empty( $headers['Template Name'] ) )
- continue;
- $page_templates[ $file ] = $this->translate_header( 'Template Name', $headers['Template Name'] );
</del><ins>+ $files = (array) self::scandir( $this->get_stylesheet_directory(), 'php', 1 );
+
+ foreach ( $files['php'] as $file => $full_path ) {
+ $headers = get_file_data( $full_path, array( 'Template Name' => 'Template Name' ) );
+ if ( empty( $headers['Template Name'] ) )
+ continue;
+ $page_templates[ $file ] = $headers['Template Name'];
+ }
+
+ $this->cache_add( 'page_templates', $page_templates );
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- $this->cache_add( 'page_templates', $page_templates );
</del><ins>+ if ( $this->load_textdomain() ) {
+ foreach ( $page_templates as &$page_template ) {
+ $page_template = $this->translate_header( 'Template Name', $page_template );
+ }
+ }
</ins><span class="cx">
</span><span class="cx"> if ( $this->parent() )
</span><span class="cx"> $page_templates += $this->parent()->get_page_templates();
</span><span class="lines">@@ -1026,7 +1032,7 @@
</span><span class="cx"> * @param string $relative_path The basename of the absolute path. Used to control the returned path
</span><span class="cx"> * for the found files, particularly when this function recurses to lower depths.
</span><span class="cx"> */
</span><del>- private static function scandir( $path, $extensions, $depth = 1, $relative_path = '' ) {
</del><ins>+ private static function scandir( $path, $extensions, $depth = 0, $relative_path = '' ) {
</ins><span class="cx"> if ( ! is_dir( $path ) )
</span><span class="cx"> return false;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>