4 files changed, 9 insertions, 2 deletions
diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php
index 680d5a2b4e..6a0b7d4ccd 100644
--- a/phpBB/includes/constants.php
+++ b/phpBB/includes/constants.php
@@ -28,7 +28,7 @@ if (!defined('IN_PHPBB'))
 */
 
 // phpBB Version
-define('PHPBB_VERSION', '3.2.0-a2-dev');
+@define('PHPBB_VERSION', '3.2.0-a2-dev');
 
 // QA-related
 // define('PHPBB_QA', 1);
@@ -235,7 +235,7 @@ define('BANLIST_TABLE',				$table_prefix . 'banlist');
 define('BBCODES_TABLE',				$table_prefix . 'bbcodes');
 define('BOOKMARKS_TABLE',			$table_prefix . 'bookmarks');
 define('BOTS_TABLE',				$table_prefix . 'bots');
-define('CONFIG_TABLE',				$table_prefix . 'config');
+@define('CONFIG_TABLE',				$table_prefix . 'config');
 define('CONFIG_TEXT_TABLE',			$table_prefix . 'config_text');
 define('CONFIRM_TABLE',				$table_prefix . 'confirm');
 define('DISALLOW_TABLE',			$table_prefix . 'disallow');
diff --git a/phpBB/install/phpbbcli.php b/phpBB/install/phpbbcli.php
index e36922f1a5..649d0c4283 100755
--- a/phpBB/install/phpbbcli.php
+++ b/phpBB/install/phpbbcli.php
@@ -23,6 +23,7 @@ if (php_sapi_name() !== 'cli')
 define('IN_PHPBB', true);
 define('IN_INSTALL', true);
 define('PHPBB_ENVIRONMENT', 'production');
+define('PHPBB_VERSION', '3.2.0-a2-dev');
 $phpbb_root_path = __DIR__ . '/../';
 $phpEx = substr(strrchr(__FILE__, '.'), 1);
 
diff --git a/phpBB/install/startup.php b/phpBB/install/startup.php
index 0d3e01efaa..927f529b73 100644
--- a/phpBB/install/startup.php
+++ b/phpBB/install/startup.php
@@ -51,6 +51,11 @@ function installer_msg_handler($errno, $msg_text, $errfile, $errline)
 {
 	global $phpbb_installer_container;
 
+	if (error_reporting() == 0)
+	{
+		return true;
+	}
+
 	switch ($errno)
 	{
 		case E_NOTICE:
diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php
index 85592bbc0d..64ab3c8861 100644
--- a/phpBB/language/en/install.php
+++ b/phpBB/language/en/install.php
@@ -316,6 +316,7 @@ $lang = array_merge($lang, array(
 	'CLI_INSTALL_VALIDATE_CONFIG'	=> 'Validate a configuration file',
 	'CLI_CONFIG_FILE'				=> 'Config file to use',
 	'MISSING_FILE'					=> 'Unable to access file %1$s',
+	'MISSING_DATA'					=> 'Config file is missing data or might contain invalid settings.',
 	'INVALID_YAML_FILE'				=> 'Could not parse YAML file %1$s',
 ));