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

Do not complain if config file is not present, as we can still work in this case (bug #1364647).

Browse Source
This commit is contained in:
Michal Čihař
2005-11-23 15:12:41 +00:00
parent 37dec301be
commit c7ec28b4c7
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -42,6 +42,8 @@ $Source$
libraries/select_server.lib.php, libraries/auth/cookie.auth.lib.php: libraries/select_server.lib.php, libraries/auth/cookie.auth.lib.php:
Functionalised server selection and use it in cookie auth (RFE Functionalised server selection and use it in cookie auth (RFE
#1362727). #1362727).
* libraries/common.lib.php: Do not complain if config file is not present,
as we can still work in this case (bug #1364647).
2005-11-22 Sebastian Mendel <cybot_tm@users.sourceforge.net> 2005-11-22 Sebastian Mendel <cybot_tm@users.sourceforge.net>
* added test/theme.php: for testing themes * added test/theme.php: for testing themes

6
libraries/common.lib.php
View File

@@ -102,6 +102,10 @@ if ( file_exists( $config_file ) ) {
} }
error_reporting( $old_error_reporting ); error_reporting( $old_error_reporting );
unset( $old_error_reporting ); unset( $old_error_reporting );
} else {
// Do not complain about missing config file
// FIXME: maybe we should issue warning in this case?
$success_apply_user_config = true;
} }
/** /**
@@ -114,7 +118,7 @@ if ( $success_apply_user_config === FALSE ) {
// Displays the error message // Displays the error message
$GLOBALS['PMA_errors'][] = $strConfigFileError $GLOBALS['PMA_errors'][] = $strConfigFileError
.'<br /><br />' .'<br /><br />'
.'<a href="./config.inc.php" taregt="_blank">config.inc.php</a>'; .'<a href="./config.inc.php" target="_blank">config.inc.php</a>';
} }
unset( $success_apply_user_config ); unset( $success_apply_user_config );