From 7b48016c66a422fe39c509728840327fb11f6502 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Thu, 16 Mar 2006 22:15:07 +0000
Subject: [PATCH] Add wrapper to show config errors even with no error
 reporting (RFE #1447173).

---
 ChangeLog                |  2 ++
 libraries/common.lib.php | 10 +++++++---
 show_config_errors.php   | 12 ++++++++++++
 3 files changed, 21 insertions(+), 3 deletions(-)
 create mode 100644 show_config_errors.php

diff --git a/ChangeLog b/ChangeLog
index 09872d782eca..d31892928992 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,6 +15,8 @@ $Source$
     * libraries/common.lib.php: Do not forget wrongly configured servers,
       otherwise user gets warning only on first access (RFE #1451521).
     * libraries/auth/config.auth.lib.php: Show possible error messages.
+    * show_config_errors.php, libraries/common.lib.php: Add wrapper to show
+      config errors even with no error reporting (RFE #1447173).
 
 2006-03-15 Michal Čihař  <michal@cihar.com>
     * libraries/export/htmlexcel.php: Fix output handling (bug #1450555).
diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index 150c9e368913..5d46ef76f84b 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -2839,9 +2839,13 @@ function PMA_setCookie($cookie, $value, $default = null)
  */
 if ($_SESSION['PMA_Config']->error_config_file) {
     $GLOBALS['PMA_errors'][] = $strConfigFileError
-        .'<br /><br />'
-        .'<a href="' . $_SESSION['PMA_Config']->getSource() . '"'
-        .' target="_blank">' . $_SESSION['PMA_Config']->getSource() . '</a>';
+        . '<br /><br />'
+        . ($_SESSION['PMA_Config']->getSource() == './config.inc.php' ? 
+        '<a href="show_config_errors.php"'
+        .' target="_blank">' . $_SESSION['PMA_Config']->getSource() . '</a>'
+        :
+        '<a href="' . $_SESSION['PMA_Config']->getSource() . '"'
+        .' target="_blank">' . $_SESSION['PMA_Config']->getSource() . '</a>');
 }
 if ($_SESSION['PMA_Config']->error_config_default_file) {
     $GLOBALS['PMA_errors'][] = sprintf($strConfigDefaultFileError,
diff --git a/show_config_errors.php b/show_config_errors.php
new file mode 100644
index 000000000000..4e18ad57a6b3
--- /dev/null
+++ b/show_config_errors.php
@@ -0,0 +1,12 @@
+<?php
+/* $Id$ */
+// vim: expandtab sw=4 ts=4 sts=4:
+
+/* Simple wrapper just to enable error reporting and include config */
+
+echo "Starting to parse config file...\n";
+
+error_reporting(E_ALL);
+require('./config.inc.php');
+
+?>