Changes in trunk/wp-admin/includes/theme.php [12187:12253]

File:

• trunk/wp-admin/includes/theme.php (modified) (3 diffs)

trunk/wp-admin/includes/theme.php

@@ -122 +122 @@
  * @since unknown
  *
- * @return array Key is template name, Value is path within the theme folder
+ * @return array Key is template name, Value is template name
  */
 function get_page_templates() {
@@ -128 +128 @@
     $theme = get_current_theme();
     $templates = $themes[$theme]['Template Files'];
-    $page_templates = array ();
+    $page_templates = array();
 
     if ( is_array( $templates ) ) {
+        $base = array( trailingslashit(get_template_directory()), trailingslashit(get_stylesheet_directory()) );
+
         foreach ( $templates as $template ) {
+            $basename = str_replace($base, '', $template);
+
+            // don't allow template files in subdirectories
+            if ( false !== strpos($basename, '/') )
+                continue;
+
             $template_data = implode( '', file( $template ));
 
@@ -139 +147 @@
 
             if ( !empty( $name ) ) {
-                $page_templates[trim( $name )] = str_replace(get_template_directory(), '', $template);
+                $page_templates[trim( $name )] = $basename;
             }
         }