bug #576018

ChangeLog

@@ -5,6 +5,9 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2002-07-14 Alexander M. Turek  <rabus@users.sourceforge.net>
+    * config.inc.php3, libraries/common.lib.php3: Fixed bug #576018.
+
 2002-07-14 Marc Delisle  <lem9@users.sourceforge.net>
     * Documentation.html, db_details_exports.php3, tbl_properties_export.php3:
       add a link to a new faq entry explaining some dump options

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!
  */

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}
         <?php
         exit();
     }
+    error_reporting($old_error_reporting);
+    unset($old_error_reporting);
 
     /**
      * Reads in the developer edition config file. This is used exclusively during
@@ -1408,7 +1411,7 @@ if (typeof(document.getElementById) != 'undefined'
             $bgcolor = '#DFDFDF';
         }
 
-		$db_details_links_count_tabs++;
+        $db_details_links_count_tabs++;
         if (!empty($attr)) {
             $attr = ' ' . $attr;
         }