nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add wrapper to show config errors even with no error reporting (RFE #1447173).

Browse Source
This commit is contained in:
Michal Čihař
2006-03-16 22:15:07 +00:00
parent 2741f16ecb
commit 7b48016c66
3 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -15,6 +15,8 @@ $Source$
* libraries/common.lib.php: Do not forget wrongly configured servers, * libraries/common.lib.php: Do not forget wrongly configured servers,
otherwise user gets warning only on first access (RFE #1451521). otherwise user gets warning only on first access (RFE #1451521).
* libraries/auth/config.auth.lib.php: Show possible error messages. * 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> 2006-03-15 Michal Čihař <michal@cihar.com>
* libraries/export/htmlexcel.php: Fix output handling (bug #1450555). * libraries/export/htmlexcel.php: Fix output handling (bug #1450555).

10
libraries/common.lib.php
View File

@@ -2839,9 +2839,13 @@ require_once './libraries/select_lang.lib.php';
*/ */
if ($_SESSION['PMA_Config']->error_config_file) { if ($_SESSION['PMA_Config']->error_config_file) {
$GLOBALS['PMA_errors'][] = $strConfigFileError $GLOBALS['PMA_errors'][] = $strConfigFileError
.'<br /><br />' . '<br /><br />'
.'<a href="' . $_SESSION['PMA_Config']->getSource() . '"' . ($_SESSION['PMA_Config']->getSource() == './config.inc.php' ?
.' target="_blank">' . $_SESSION['PMA_Config']->getSource() . '</a>'; '<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) { if ($_SESSION['PMA_Config']->error_config_default_file) {
$GLOBALS['PMA_errors'][] = sprintf($strConfigDefaultFileError, $GLOBALS['PMA_errors'][] = sprintf($strConfigDefaultFileError,

12
show_config_errors.php Normal file
View File

@@ -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');
?>