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

Timestamp:

03/30/2012 02:06:33 PM (13 years ago)

Author:

nacin

Message:

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 #20103. see #11216.

File:

• trunk/wp-includes/class-wp-theme.php (modified) (4 diffs)

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

@@ -397 +397 @@
                 return $this->get_stylesheet();
             case 'Template Files' :
-                $files = $this->get_files( 'php', 1 );
+                $files = $this->get_files( 'php' );
                 if ( $this->parent() )
-                    $files = array_merge( $files, $this->parent()->get_files( 'php', 1 ) );
+                    $files = array_merge( $files, $this->parent()->get_files( 'php' ) );
                 return $files;
             case 'Stylesheet Files' :
@@ -962 +962 @@
      *  returns an array, with the keys being the file types, and the values being an array of files for those type.
      */
-    public function get_files( $type = null, $depth = 0 ) {
+    public function get_files( $type ) {
         $files = $this->cache_get( 'files' );
         if ( ! is_array( $files ) ) {
-            $files = (array) self::scandir( $this->get_stylesheet_directory(), array( 'php', 'css' ), $depth );
+            $files = (array) self::scandir( $this->get_stylesheet_directory(), array( 'php', 'css' ), 1 );
             foreach ( $files as &$group )
                 ksort( $group );
-            unset( $group );
             $this->cache_add( 'files', $files );
         }
@@ -994 +993 @@
 
         $page_templates = $this->cache_get( 'page_templates' );
-        if ( is_array( $page_templates ) )
-            return $page_templates;
-        $page_templates = array();
-
-        $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 ] = $this->translate_header( 'Template Name', $headers['Template Name'] );
-        }
-
-        $this->cache_add( 'page_templates', $page_templates );
+
+        if ( ! is_array( $page_templates ) ) {
+            $page_templates = array();
+
+            $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 );
+        }
+
+        if ( $this->load_textdomain() ) {
+            foreach ( $page_templates as &$page_template ) {
+                $page_template = $this->translate_header( 'Template Name', $page_template );
+            }
+        }
 
         if ( $this->parent() )
@@ -1027 +1033 @@
      *  for the found files, particularly when this function recurses to lower depths.
      */
-    private static function scandir( $path, $extensions, $depth = 1, $relative_path = '' ) {
+    private static function scandir( $path, $extensions, $depth = 0, $relative_path = '' ) {
         if ( ! is_dir( $path ) )
             return false;