Ticket #2926: r3979_theme-editor.patch

wp-admin/theme-editor.php

@@ -120 +120 @@
 <?php
 if ($allowed_files) :
 ?>
+<?php 
+foreach($allowed_files as $allowed_file) :
+        $filename_root = trim(get_file_description($allowed_file));
+        $filename = $filename_root;
+        $i = 2;
+        while (array_key_exists($filename, $files_tmp))
+        {
+                $filename = $filename_root . " ($i)";
+                $i++;
+        }
+        $files_tmp[$filename] = $allowed_file;
+endforeach;
+if ($files_tmp) :
+        ksort($files_tmp);
+        $allowed_files = $files_tmp;
+endif;
+?>
   <ul>
-<?php foreach($allowed_files as $allowed_file) : ?>
-                 <li><a href="theme-editor.php?file=<?php echo "$allowed_file"; ?>&amp;theme=<?php echo urlencode($theme) ?>"><?php echo get_file_description($allowed_file); ?></a></li>
+<?php foreach($allowed_files as $file_name => $allowed_file) : ?>
+                 <li><a href="theme-editor.php?file=<?php echo "$allowed_file"; ?>&amp;theme=<?php echo urlencode($theme) ?>"><?php echo $file_name; ?></a></li>
 <?php endforeach; ?>
   </ul>
 <?php endif; ?>