Ticket #27201: 27201.4.diff

src/wp-admin/includes/file.php

@@ -58 +58 @@
 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 ) ) {
+        if ( isset( $wp_file_descriptions[ basename( $file ) ] ) && basename( dirname( dirname( $file ) ) ) == 'themes' ) {
+                   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 ))
+                if ( preg_match( '|Template Name:(.*)$|mi', $template_data, $name ) ) {
                         return sprintf( __( '%s Page Template' ), _cleanup_header_comment($name[1]) );
+                }
         }
 
         return trim( basename( $file ) );

src/wp-admin/theme-editor.php

@@ -129 +129 @@
 
 $description = get_file_description( $file );
 $file_show = array_search( $file, array_filter( $allowed_files ) );
-if ( $description != $file_show )
+if ( $description != $file_show ) {
         $description .= ' <span>(' . $file_show . ')</span>';
+} else {
+        $description = basename( $file ).' <span>(' . $file_show . ')</span>';
+}
 ?>
 <div class="wrap">
 <h2><?php echo esc_html( $title ); ?></h2>
@@ -180 +183 @@
                         echo "\t</ul>\n\t<h3>" . _x( 'Styles', 'Theme stylesheets in theme editor' ) . "</h3>\n\t<ul>\n";
 
                 $file_description = get_file_description( $absolute_filename );
-                if ( $file_description != basename( $filename ) )
+                if ( $file_description != basename( $filename ) ) {
+                        if( basename( dirname( dirname( $absolute_filename ) ) ) !== 'themes' ) {
+                                $file_description .= basename( $filename );     
+                        }
                         $file_description .= '<br /><span class="nonessential">(' . $filename . ')</span>';
+                }
 
-                if ( $absolute_filename == $file )
+                if ( $absolute_filename == $file ) {
                         $file_description = '<span class="highlight">' . $file_description . '</span>';
+                }
 ?>
                 <li><a href="theme-editor.php?file=<?php echo urlencode( $filename ) ?>&amp;theme=<?php echo urlencode( $stylesheet ) ?>"><?php echo $file_description; ?></a></li>
 <?php