diff options
| -rwxr-xr-x | ChangeLog | 2 | ||||
| -rw-r--r-- | libraries/select_theme.lib.php | 2 | ||||
| -rw-r--r-- | themes.php | 7 |
3 files changed, 5 insertions, 6 deletions
@@ -11,6 +11,8 @@ $Source$ * config.inc.php, libraries/common.lib.php, libraries/config_import.lib.php, libraries/display_export.lib.php: Configurable file name templates (RFE #1226941). + * themes.php, libraries/select_theme.lib.php: Sort themes, use only one + code for browsing directory with themes (RFE #1184251). 2005-06-24 Marc Delisle <lem9@users.sourceforge.net> * db_operations.php: problem renaming a db diff --git a/libraries/select_theme.lib.php b/libraries/select_theme.lib.php index 3e29a3b09e..8659422b73 100644 --- a/libraries/select_theme.lib.php +++ b/libraries/select_theme.lib.php @@ -77,6 +77,8 @@ if ($PMA_ThemeAvailable == TRUE) { // themeManager is available closedir($handleThemes); } // end themeManger +asort($available_themes_choices); + if (isset($set_theme)) { // if user submit a theme setcookie('pma_theme', $set_theme, time() + 60*60*24*30, $GLOBALS['cookie_path'], '', $GLOBALS['is_https']); } else { // else check if user have a theme cookie 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> |