makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-27 21:58:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #4074 from marc1706/ticket/14349

Browse source 
[ticket/14349] Improve error messages and remove output of suppressed messages
This commit is contained in:
Máté Bartus 2015-12-09 19:14:48 +01:00
commit 18377d63ee
4 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
phpBB/includes/constants.php
View file

@ -28,7 +28,7 @@ if (!defined('IN_PHPBB'))
*/ */
// phpBB Version // phpBB Version
define('PHPBB_VERSION', '3.2.0-a2-dev'); @define('PHPBB_VERSION', '3.2.0-a2-dev');
// QA-related // QA-related
// define('PHPBB_QA', 1); // define('PHPBB_QA', 1);
@ -235,7 +235,7 @@ define('BANLIST_TABLE', $table_prefix . 'banlist');
define('BBCODES_TABLE', $table_prefix . 'bbcodes'); define('BBCODES_TABLE', $table_prefix . 'bbcodes');
define('BOOKMARKS_TABLE', $table_prefix . 'bookmarks'); define('BOOKMARKS_TABLE', $table_prefix . 'bookmarks');
define('BOTS_TABLE', $table_prefix . 'bots'); 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('CONFIG_TEXT_TABLE', $table_prefix . 'config_text');
define('CONFIRM_TABLE', $table_prefix . 'confirm'); define('CONFIRM_TABLE', $table_prefix . 'confirm');
define('DISALLOW_TABLE', $table_prefix . 'disallow'); define('DISALLOW_TABLE', $table_prefix . 'disallow');

1
phpBB/install/phpbbcli.php
View file

@ -23,6 +23,7 @@ if (php_sapi_name() !== 'cli')
define('IN_PHPBB', true); define('IN_PHPBB', true);
define('IN_INSTALL', true); define('IN_INSTALL', true);
define('PHPBB_ENVIRONMENT', 'production'); define('PHPBB_ENVIRONMENT', 'production');
define('PHPBB_VERSION', '3.2.0-a2-dev');
$phpbb_root_path = __DIR__ . '/../'; $phpbb_root_path = __DIR__ . '/../';
$phpEx = substr(strrchr(__FILE__, '.'), 1); $phpEx = substr(strrchr(__FILE__, '.'), 1);

5
phpBB/install/startup.php
View file

@ -51,6 +51,11 @@ function installer_msg_handler($errno, $msg_text, $errfile, $errline)
{ {
global $phpbb_installer_container; global $phpbb_installer_container;
if (error_reporting() == 0)
{
return true;
}
switch ($errno) switch ($errno)
{ {
case E_NOTICE: case E_NOTICE:

1
phpBB/language/en/install.php
View file

@ -316,6 +316,7 @@ $lang = array_merge($lang, array(
'CLI_INSTALL_VALIDATE_CONFIG' => 'Validate a configuration file', 'CLI_INSTALL_VALIDATE_CONFIG' => 'Validate a configuration file',
'CLI_CONFIG_FILE' => 'Config file to use', 'CLI_CONFIG_FILE' => 'Config file to use',
'MISSING_FILE' => 'Unable to access file %1$s', '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', 'INVALID_YAML_FILE' => 'Could not parse YAML file %1$s',
)); ));