diff --git a/ChangeLog b/ChangeLog index be29339bf..ab2a3c62a 100755 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,9 @@ phpMyAdmin - Changelog $Id$ $Source$ +2002-07-14 Alexander M. Turek + * config.inc.php3, libraries/common.lib.php3: Fixed bug #576018. + 2002-07-14 Marc Delisle * Documentation.html, db_details_exports.php3, tbl_properties_export.php3: add a link to a new faq entry explaining some dump options diff --git a/config.inc.php3 b/config.inc.php3 index a14519da9..8fc2e1bbb 100755 --- a/config.inc.php3 +++ b/config.inc.php3 @@ -12,7 +12,9 @@ /** * Sets the php error reporting - Please do not change this line! */ -$old_error_rep = error_reporting(E_ALL); +if (!isset($old_error_reporting)) { + error_reporting(E_ALL); +} /** @@ -458,13 +460,6 @@ if ($cfg['UseSyntaxColoring']) { set_magic_quotes_runtime(0); -/** - * Restore old error_reporting mode - do not change either! - */ -error_reporting($old_error_rep); -unset($old_error_rep); - - /** * File Revision - do not change either! */ diff --git a/libraries/common.lib.php3 b/libraries/common.lib.php3 index 25c529e2b..ba78c6bb6 100644 --- a/libraries/common.lib.php3 +++ b/libraries/common.lib.php3 @@ -71,7 +71,8 @@ if (!defined('PMA_COMMON_LIB_INCLUDED')){ * Parses the configuration file and gets some constants used to define * versions of phpMyAdmin/php/mysql... */ - if (!@include('./config.inc.php3')) { + $old_error_reporting = error_reporting(0); + if (!include('./config.inc.php3')) { // Creates fake settings $cfg = array('DefaultLang' => 'en'); // Loads the laguage file @@ -108,6 +109,8 @@ h1 {font-family: sans-serif; font-size: large; font-weight: bold}