diff --git a/ChangeLog b/ChangeLog index 5ffdb985d..0f672f8ec 100755 --- a/ChangeLog +++ b/ChangeLog @@ -42,6 +42,8 @@ $Source$ libraries/select_server.lib.php, libraries/auth/cookie.auth.lib.php: Functionalised server selection and use it in cookie auth (RFE #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 * added test/theme.php: for testing themes diff --git a/libraries/common.lib.php b/libraries/common.lib.php index 499fa8e78..dfd39682c 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -102,6 +102,10 @@ if ( file_exists( $config_file ) ) { } error_reporting( $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 $GLOBALS['PMA_errors'][] = $strConfigFileError .'

' - .'config.inc.php'; + .'config.inc.php'; } unset( $success_apply_user_config );