From 9fe2097f398d2003c12063da20ee5667f751820c Mon Sep 17 00:00:00 2001 From: Sebastian Mendel Date: Mon, 5 Dec 2005 13:20:07 +0000 Subject: [PATCH] make use of PMA_array_merge_recursive() (forgot to remove debug code) --- libraries/Config.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 22cd28d90..a22b67dfa 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -249,7 +249,7 @@ class PMA_Config { } function __wakeup() { - if ( true || $this->source_mtime !== filemtime( $this->getSource() ) + if ( $this->source_mtime !== filemtime( $this->getSource() ) || $this->error_config_file || $this->error_config_default_file ) { $this->load( $this->getSource() ); }