nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Do not attempt to sort themes when themes are disabled (bug #1243883).

Browse Source
This commit is contained in:
Michal Čihař
2005-07-24 12:07:21 +00:00
parent d67f568212
commit f6f6df1037
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -8,8 +8,10 @@ $Source$
2005-07-24 Michal Čihař <michal@cihar.com> 2005-07-24 Michal Čihař <michal@cihar.com>
* libraries/check_user_privileges.lib.php: Undefined variable (bug * libraries/check_user_privileges.lib.php: Undefined variable (bug
#1243885). #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. 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 <lem9@users.sourceforge.net> 2005-07-23 Marc Delisle <lem9@users.sourceforge.net>
* tbl_properties_structure.php, tbl_properties.inc.php: * tbl_properties_structure.php, tbl_properties.inc.php:

3
libraries/select_theme.lib.php
View File

@@ -75,10 +75,9 @@ if ($PMA_ThemeAvailable == TRUE) { // themeManager is available
} // end get themes } // end get themes
} // end check for themes directory } // end check for themes directory
closedir($handleThemes); closedir($handleThemes);
asort($available_themes_choices);
} // end themeManger } // end themeManger
asort($available_themes_choices);
// Allow different theme per server // Allow different theme per server
$theme_cookie_name = 'pma_theme'; $theme_cookie_name = 'pma_theme';
if ($GLOBALS['cfg']['ThemePerServer']) { if ($GLOBALS['cfg']['ThemePerServer']) {