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

config_import.lib should merge default settings

Browse Source
This commit is contained in:
Alexander M. Turek
2004-06-14 23:14:21 +00:00
parent 33ac9f3150
commit 7a30c07bec
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -5,6 +5,9 @@ phpMyAdmin - Changelog
$Id$ $Id$
$Source$ $Source$
2004-06-09 Alexander M. Turek <me@derrabus.de>
* libraries/config_import.lib.php: The default settings should be merged.
2004-06-14 Marc Delisle <lem9@users.sourceforge.net> 2004-06-14 Marc Delisle <lem9@users.sourceforge.net>
Changes, thanks to Michael Keck (mkkeck): Changes, thanks to Michael Keck (mkkeck):
* images/b_tblops.png, themes/darkblue_orange/img/b_tblops.png: new icon * images/b_tblops.png, themes/darkblue_orange/img/b_tblops.png: new icon

12
libraries/config_import.lib.php
View File

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