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

Actually load configuration.

Browse Source
This commit is contained in:
Michal Čihař
2005-11-30 18:59:48 +00:00
parent e55f488ebf
commit 17a3ebe53a
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -7,6 +7,7 @@ $Source$
2005-11-30 Michal Čihař <michal@cihar.com> 2005-11-30 Michal Čihař <michal@cihar.com>
* lang/*: Messages for Sebastian. * lang/*: Messages for Sebastian.
* libraries/Config.class.php: Actually load configuration.
2005-11-30 Sebastian Mendel <cybot_tm@users.sourceforge.net> 2005-11-30 Sebastian Mendel <cybot_tm@users.sourceforge.net>
* libraries/Config.class.php: * libraries/Config.class.php:

4
libraries/Config.class.php
View File

@@ -329,6 +329,8 @@ class PMA_Config {
$this->checkCollationConnection(); $this->checkCollationConnection();
//$this->checkPmaAbsoluteUri(); //$this->checkPmaAbsoluteUri();
$this->settings = array_merge( $this->settings, $cfg );
return true;
} }
/** /**
@@ -610,4 +612,4 @@ class PMA_Config {
*/ */
function save() {} function save() {}
} }
?> ?>