From f6f6df1037e0f4bfbe1db59213ab3a6ac424d8ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Sun, 24 Jul 2005 12:07:21 +0000 Subject: [PATCH] Do not attempt to sort themes when themes are disabled (bug #1243883). --- ChangeLog | 4 +++- libraries/select_theme.lib.php | 3 +-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 46c8a07ed..dd36775c2 100755 --- a/ChangeLog +++ b/ChangeLog @@ -8,8 +8,10 @@ $Source$ 2005-07-24 Michal Čihař * libraries/check_user_privileges.lib.php: Undefined variable (bug #1243885). - * ibraries/config_import.lib.php: Do not override theme properties when + * libraries/config_import.lib.php: Do not override theme properties when path is not set. + * libraries/select_theme.lib.php: Do not attempt to sort themes when + themes are disabled (bug #1243883). 2005-07-23 Marc Delisle * tbl_properties_structure.php, tbl_properties.inc.php: diff --git a/libraries/select_theme.lib.php b/libraries/select_theme.lib.php index d6fd363b6..a195cf220 100644 --- a/libraries/select_theme.lib.php +++ b/libraries/select_theme.lib.php @@ -75,10 +75,9 @@ if ($PMA_ThemeAvailable == TRUE) { // themeManager is available } // end get themes } // end check for themes directory closedir($handleThemes); + asort($available_themes_choices); } // end themeManger -asort($available_themes_choices); - // Allow different theme per server $theme_cookie_name = 'pma_theme'; if ($GLOBALS['cfg']['ThemePerServer']) {