Changeset 34658 for trunk/src/wp-admin/includes/file.php

Timestamp:

09/28/2015 03:10:08 AM (10 years ago)

Author:

wonderboymusic

Message:

Theme Editor: ensure that files named index.php in theme subfolders are not labeled as "Main Index Template"

Props MikeHansenMe, wonderboymusic, bravokeyl, Shelob9.
Fixes #27201.

File:

• trunk/src/wp-admin/includes/file.php (modified) (1 diff)

trunk/src/wp-admin/includes/file.php

@@ -52 +52 @@
  * @global array $wp_file_descriptions
  * @param string $file Filesystem path or filename
- * @return string Description of file from $wp_file_descriptions or basename of $file if description doesn't exist
+ * @return string Description of file from $wp_file_descriptions or basename of $file if description doesn't exist.
+ *                Appends 'Page Template' to basename of $file if the file is a page template
  */
 function get_file_description( $file ) {
-    global $wp_file_descriptions;
-
-    if ( isset( $wp_file_descriptions[basename( $file )] ) ) {
-        return $wp_file_descriptions[basename( $file )];
-    }
-    elseif ( file_exists( $file ) && is_file( $file ) ) {
-        $template_data = implode( '', file( $file ) );
-        if ( preg_match( '|Template Name:(.*)$|mi', $template_data, $name ))
-            return sprintf( __( '%s Page Template' ), _cleanup_header_comment($name[1]) );
+    global $wp_file_descriptions, $allowed_files;
+
+    $relative_pathinfo = pathinfo( $file );
+    $file_path = $allowed_files[ $file ];
+    if ( isset( $wp_file_descriptions[ basename( $file ) ] ) && '.' === $relative_pathinfo['dirname'] ) {
+        return $wp_file_descriptions[ basename( $file ) ];
+    } elseif ( file_exists( $file_path ) && is_file( $file_path ) ) {
+        $template_data = implode( '', file( $file_path ) );
+        if ( preg_match( '|Template Name:(.*)$|mi', $template_data, $name ) ) {
+            return sprintf( __( '%s Page Template' ), _cleanup_header_comment( $name[1] ) );
+        }
     }