diff options
Diffstat (limited to 'phpBB/install')
-rw-r--r-- | phpBB/install/convertors/convert_phpbb20.php | 2 | ||||
-rwxr-xr-x | phpBB/install/phpbbcli.php | 2 | ||||
-rw-r--r-- | phpBB/install/schemas/schema.json | 44 | ||||
-rw-r--r-- | phpBB/install/schemas/schema_data.sql | 2 |
4 files changed, 25 insertions, 25 deletions
diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php index 977670c94c..e5866add7d 100644 --- a/phpBB/install/convertors/convert_phpbb20.php +++ b/phpBB/install/convertors/convert_phpbb20.php @@ -38,7 +38,7 @@ $dbms = $phpbb_config_php_file->convert_30_dbms_to_31($dbms); $convertor_data = array( 'forum_name' => 'phpBB 2.0.x', 'version' => '1.0.3', - 'phpbb_version' => '3.2.0-b3-dev', + 'phpbb_version' => '3.2.0-RC1', 'author' => '<a href="https://www.phpbb.com/">phpBB Limited</a>', 'dbms' => $dbms, 'dbhost' => $dbhost, diff --git a/phpBB/install/phpbbcli.php b/phpBB/install/phpbbcli.php index 87eab84b5a..3803fe7034 100755 --- a/phpBB/install/phpbbcli.php +++ b/phpBB/install/phpbbcli.php @@ -23,7 +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-b3-dev'); +define('PHPBB_VERSION', '3.2.0-RC1'); $phpbb_root_path = __DIR__ . '/../'; $phpEx = substr(strrchr(__FILE__, '.'), 1); diff --git a/phpBB/install/schemas/schema.json b/phpBB/install/schemas/schema.json index 9c278e5ff7..2b77c1efa5 100644 --- a/phpBB/install/schemas/schema.json +++ b/phpBB/install/schemas/schema.json @@ -800,22 +800,6 @@ "UINT:20", 0 ], - "enable_shadow_prune": [ - "BOOL", - 0 - ], - "prune_shadow_days": [ - "UINT", - 7 - ], - "prune_shadow_freq": [ - "UINT", - 1 - ], - "prune_shadow_next": [ - "INT:11", - 0 - ], "forum_posts_approved": [ "UINT", 0 @@ -839,6 +823,22 @@ "forum_topics_softdeleted": [ "UINT", 0 + ], + "enable_shadow_prune": [ + "BOOL", + 0 + ], + "prune_shadow_days": [ + "UINT", + 7 + ], + "prune_shadow_freq": [ + "UINT", + 1 + ], + "prune_shadow_next": [ + "INT:11", + 0 ] }, "PRIMARY_KEY": "forum_id", @@ -2138,15 +2138,15 @@ "VCHAR", "" ], - "pf_phpbb_location": [ + "pf_phpbb_twitter": [ "VCHAR", "" ], - "pf_phpbb_twitter": [ + "pf_phpbb_facebook": [ "VCHAR", "" ], - "pf_phpbb_website": [ + "pf_phpbb_skype": [ "VCHAR", "" ], @@ -2154,15 +2154,15 @@ "VCHAR", "" ], - "pf_phpbb_googleplus": [ + "pf_phpbb_location": [ "VCHAR", "" ], - "pf_phpbb_facebook": [ + "pf_phpbb_googleplus": [ "VCHAR", "" ], - "pf_phpbb_skype": [ + "pf_phpbb_website": [ "VCHAR", "" ], diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index 9791174e0f..0cff26977e 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -276,7 +276,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('tpl_allow_php', '0 INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_icons_path', 'images/upload_icons'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_path', 'files'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('use_system_cron', '0'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.2.0-b3-dev'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.2.0-RC2-dev'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_expire_days', '90'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_gc', '14400'); |