Changeset 21117

Timestamp:

06/25/2012 09:07:07 PM (12 years ago)

Author:

nacin

Message:

Revert detection of page templates to 3.3 functionality.

WP_Theme in 3.4.0 used get_file_data(), which is far too strict when
compared to the original regular expression in get_page_templates().
This causes missing templates when, for example, the PHP comment
starts on the same line as the header.

see #20955 for trunk.

File:

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

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

@@ -931 +931 @@
 
             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] );
             }