Sort themes, use only one code for browsing directory with themes (RFE #1184251).

1 files changed, 1 insertions, 6 deletions

diff --git a/themes.php b/themes.php
index 082d03db4d..db40b5520e 100644
--- a/themes.php
+++ b/themes.php
@@ -84,9 +84,7 @@ echo "<?xml version=\"1.0\" encoding=\"" . $GLOBALS['charset'] . "\"?".">";
             <td><img src="<?php echo $GLOBALS['pmaThemeImage'] . 'spacer.png'; ?>" width="1" height="1" border="0" alt="" /></td>
         </tr>
         <?php
-if ($handleThemes = opendir($path_to_themes)) { // open themes
-    while (false !== ($PMA_Theme = readdir($handleThemes))) {  // get screens
-        if ($PMA_Theme != "." && $PMA_Theme != "..") {
+foreach ($available_themes_choices AS $PMA_Theme) {
             $screen_directory = $path_to_themes . $PMA_Theme;
 
             // check for theme requires/name
@@ -142,9 +140,6 @@ if ($handleThemes = opendir($path_to_themes)) { // open themes
         </tr>
 <?php
             } // end 'screen output'
-        } // end 'check theme'
-    } // end 'get screens'
-    closedir($handleThemes);
 } // end 'open themes'
 ?>
     </table>