Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpmyadmin/phpmyadmin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Čihař <michal@cihar.com>2006-03-17 01:15:07 +0300
committerMichal Čihař <michal@cihar.com>2006-03-17 01:15:07 +0300
commit7b48016c66a422fe39c509728840327fb11f6502 (patch)
tree8ebd71e2fb549a2096d7cef62972b2acd5a2e746
parent2741f16ecb51d61b208689c2d7b39b5275faf542 (diff)
Add wrapper to show config errors even with no error reporting (RFE #1447173).
-rwxr-xr-xChangeLog2
-rw-r--r--libraries/common.lib.php10
-rw-r--r--show_config_errors.php12
3 files changed, 21 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 09872d782e..d318929289 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 150c9e3689..5d46ef76f8 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -2839,9 +2839,13 @@ require_once './libraries/select_lang.lib.php';
*/
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 0000000000..4e18ad57a6
--- /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');
+
+?>