Changeset 20317 for trunk/wp-includes/class-wp-theme.php

Timestamp:

03/29/2012 05:37:37 AM (14 years ago)

Author:

nacin

Message:

Use new scandir() return value (key is path relative to theme, value is absolute path) in WP_Theme->get_page_templates(). Use parent()->get_page_templates() and merge in a parent's page templates, rather than extra logic. see [20312], see #20103.

File:

• trunk/wp-includes/class-wp-theme.php (modified) (1 diff)

trunk/wp-includes/class-wp-theme.php

@@ -998 +998 @@
                 $page_templates = array();
 
-                $files = (array) self::scandir( $this->get_template_directory(), 'php' );
-                if ( $this->is_child_theme() )
-                        $files = array_merge_recursive( $files, (array) self::scandir( $this->get_stylesheet_directory(), 'php' ) );
-
-                foreach ( $files['php'] as $file ) {
-                        $headers = get_file_data( $file, array( 'Template Name' => 'Template Name' ) );
+                $files = (array) self::scandir( $this->get_stylesheet_directory(), 'php' );
+
+                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[ basename( $file ) ] = $this->translate_header( 'Template Name', $headers['Template Name'] );
+                        $page_templates[ $file ] = $this->translate_header( 'Template Name', $headers['Template Name'] );
                 }
 
                 $this->cache_add( 'page_templates', $page_templates );
+
+                if ( $this->parent() )
+                        $page_templates += $this->parent()->get_page_templates();
+
                 return $page_templates;
         }