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

Do not override theme properties when path is not set.

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

2
ChangeLog
View File

@@ -8,6 +8,8 @@ $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
path is not set.
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:

16
libraries/config_import.lib.php
View File

@@ -754,16 +754,14 @@ if (!isset($cfg['ReplaceHelpImg'])) {
if (!isset($cfg['ThemePath'])) { if (!isset($cfg['ThemePath'])) {
$cfg['ThemePath'] = './themes'; $cfg['ThemePath'] = './themes';
$cfg['ThemeDefault'] = 'original';
$cfg['ThemeManager'] = TRUE;
} else {
if (!isset($cfg['ThemeDefault'])){
$cfg['ThemeDefault'] = 'original';
}
if (!isset($cfg['ThemeManager'])){
$cfg['ThemeManager'] = TRUE;
}
} }
if (!isset($cfg['ThemeDefault'])){
$cfg['ThemeDefault'] = 'original';
}
if (!isset($cfg['ThemeManager'])){
$cfg['ThemeManager'] = TRUE;
}
if (!isset($cfg['ThemePerServer'])){ if (!isset($cfg['ThemePerServer'])){
$cfg['ThemePerServer'] = FALSE; $cfg['ThemePerServer'] = FALSE;
} }