WordPress 3.4.1

[autoinstalls/wordpress.git] / wp-includes / class-wp-theme.php

diff --git a/wp-includes/class-wp-theme.php b/wp-includes/class-wp-theme.php
index b07e0b5fbd04bacba18e6fd018a3b56d35e64f6a..049bfb4bd297291f8aee0d4d75692d4c7b22d7b2 100644 (file)
--- a/wp-includes/class-wp-theme.php
+++ b/wp-includes/class-wp-theme.php
@@ -930,10 +930,9 @@ final class WP_Theme implements ArrayAccess {
                        $files = (array) $this->get_files( 'php', 1 );
 
                        foreach ( $files as $file => $full_path ) {
-                               $headers = get_file_data( $full_path, array( 'Template Name' => 'Template Name' ) );
-                               if ( empty( $headers['Template Name'] ) )
+                               if ( ! preg_match( '|Template Name:(.*)$|mi', file_get_contents( $full_path ), $header ) )
                                        continue;
-                               $page_templates[ $file ] = $headers['Template Name'];
+                               $page_templates[ $file ] = _cleanup_header_comment( $header[1] );
                        }
 
                        $this->cache_add( 'page_templates', $page_templates );