diff --git a/ChangeLog b/ChangeLog index 4064b58c2..1ffcf7ebf 100755 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,10 @@ phpMyAdmin - Changelog $Id$ $Source$ +2006-02-23 Marc Delisle + * libraries/Config.class.php: bug #1418769 part 1: stat failed for + ./config.inc.php (under PHP 4) + 2006-02-22 Marc Delisle * libraries/display_tbl.lib.php: bug #1435303, error on empty BLOB transf. * .htaccess: added a reference to FAQ 1.36 diff --git a/libraries/Config.class.php b/libraries/Config.class.php index b534f9a34..253b8fcd0 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -278,7 +278,7 @@ class PMA_Config */ function __wakeup() { - if ( $this->source_mtime !== filemtime($this->getSource()) + if (file_exists($this->getSource()) && $this->source_mtime !== filemtime($this->getSource()) || $this->error_config_file || $this->error_config_default_file ) { $this->settings = array(); $this->load($this->getSource());