diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2015-12-08 22:14:25 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2015-12-08 22:14:25 +0100 |
| commit | 2d3e340f1910d93a6d7aa672f26f8dbeb4f74a6d (patch) | |
| tree | e57df445d8fdfa91634e95030631decd1b929d79 | |
| parent | d99927d3a6a821a64a41b987071d18f9b2989da0 (diff) | |
| download | forums-2d3e340f1910d93a6d7aa672f26f8dbeb4f74a6d.tar forums-2d3e340f1910d93a6d7aa672f26f8dbeb4f74a6d.tar.gz forums-2d3e340f1910d93a6d7aa672f26f8dbeb4f74a6d.tar.bz2 forums-2d3e340f1910d93a6d7aa672f26f8dbeb4f74a6d.tar.xz forums-2d3e340f1910d93a6d7aa672f26f8dbeb4f74a6d.zip | |
[ticket/14349] Suppress output due to duplicate definition in installer
PHPBB3-14349
| -rw-r--r-- | phpBB/includes/constants.php | 4 | ||||
| -rwxr-xr-x | phpBB/install/phpbbcli.php | 1 |
2 files changed, 3 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); |