Ticket #27201: 27201-3.patch

includes/file.php

@@ -53 +53 @@
  * @uses _cleanup_header_comment
  * @uses $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 only for top level directory files of themes for others empty string or basename of $file if description doesn't exist
  */
 function get_file_description( $file ) {
         global $wp_file_descriptions;
 
         if ( isset( $wp_file_descriptions[basename( $file )] ) ) {
-                return $wp_file_descriptions[basename( $file )];
+                if( basename( dirname( dirname( $file ) ) ) == 'themes'){
+                   return $wp_file_descriptions[basename( $file )];
+                }
+                return '';
         }
         elseif ( file_exists( $file ) && is_file( $file ) ) {
                 $template_data = implode( '', file( $file ) );
@@ -1108 +1111 @@
 </form>
 <?php
         return false;
-}
+}
+ No newline at end of file

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 && basename( dirname( dirname( $file ) ) ) == 'themes' ) {
         $description .= ' <span>(' . $file_show . ')</span>';
+}
+else {
+        $description = basename( $file ).' <span>(' . $file_show . ')</span>';
+}
 ?>
 <div class="wrap">
 <h2><?php echo esc_html( $title ); ?></h2>
@@ -180 +184 @@
                         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( basename( dirname( dirname( $absolute_filename ) ) ) !== 'themes' ){
+                                $file_description .= basename( $filename );     
+                        }
                         $file_description .= '<br /><span class="nonessential">(' . $filename . ')</span>';
 
                 if ( $absolute_filename == $file )