<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[12253] trunk/wp-admin/includes/theme.php: Don'
 t show page templates in the drop down if they are in a subdirectory.</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12253">12253</a></dd>
<dt>Author</dt> <dd>westi</dd>
<dt>Date</dt> <dd>2009-11-21 10:05:19 +0000 (Sat, 21 Nov 2009)</dd>
</dl>

<h3>Log Message</h3>
<pre>Don't show page templates in the drop down if they are in a subdirectory. Fixes <a href="http://trac.wordpress.org/ticket/10959">#10959</a> props scribu.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesthemephp">trunk/wp-admin/includes/theme.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesthemephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/theme.php (12252 => 12253)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/theme.php        2009-11-21 09:43:45 UTC (rev 12252)
+++ trunk/wp-admin/includes/theme.php        2009-11-21 10:05:19 UTC (rev 12253)
</span><span class="lines">@@ -127,10 +127,18 @@
</span><span class="cx">         $themes = get_themes();
</span><span class="cx">         $theme = get_current_theme();
</span><span class="cx">         $templates = $themes[$theme]['Template Files'];
</span><del>-        $page_templates = array ();
</del><ins>+        $page_templates = array();
</ins><span class="cx"> 
</span><span class="cx">         if ( is_array( $templates ) ) {
</span><ins>+                $base = array( trailingslashit(get_template_directory()), trailingslashit(get_stylesheet_directory()) );
+
</ins><span class="cx">                 foreach ( $templates as $template ) {
</span><ins>+                        $basename = str_replace($base, '', $template);
+
+                        // don't allow template files in subdirectories
+                        if ( false !== strpos($basename, '/') )
+                                continue;
+
</ins><span class="cx">                         $template_data = implode( '', file( $template ));
</span><span class="cx"> 
</span><span class="cx">                         $name = '';
</span><span class="lines">@@ -138,7 +146,7 @@
</span><span class="cx">                                 $name = _cleanup_header_comment($name[1]);
</span><span class="cx"> 
</span><span class="cx">                         if ( !empty( $name ) ) {
</span><del>-                                $page_templates[trim( $name )] = basename( $template ); ;
</del><ins>+                                $page_templates[trim( $name )] = $basename;
</ins><span class="cx">                         }
</span><span class="cx">                 }
</span><span class="cx">         }
</span></span></pre>
</div>
</div>

</body>
</html>