From c185c3b64bcba881f723eb2ea9fee35afe9c29ec Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Sat, 8 Nov 2008 20:02:22 +0000 Subject: [PATCH] Fix Bug #36535 (PHP 5.3 compatibility) + version number updates (if RC2 will be released we will change it again. ;)) git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9050 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/includes/constants.php | 2 +- phpBB/install/database_update.php | 7 +++++-- phpBB/install/schemas/schema_data.sql | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php index e2a43da8c4..3a468e4952 100644 --- a/phpBB/includes/constants.php +++ b/phpBB/includes/constants.php @@ -25,7 +25,7 @@ if (!defined('IN_PHPBB')) */ // phpBB Version -define('PHPBB_VERSION', '3.0.3-RC1'); +define('PHPBB_VERSION', '3.0.3'); // QA-related // define('PHPBB_QA', 1); diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index a6abc21508..5fe9c19964 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -78,7 +78,7 @@ if (version_compare(PHP_VERSION, '6.0.0-dev', '>=')) } else { - set_magic_quotes_runtime(0); + @set_magic_quotes_runtime(0); define('STRIP', (get_magic_quotes_gpc()) ? true : false); } @@ -545,6 +545,9 @@ $database_update_info = array( ), ), ), + + // No changes from 3.0.3-RC1 to 3.0.3 + '3.0.3-RC1' => array(), ); // Determine mapping database type @@ -1936,7 +1939,7 @@ function change_database_data(&$no_updates, $version) $no_updates = false; break; - // Changes from 3.0.3-RC1 to 3.0.3-RC2 + // Changes from 3.0.3-RC1 to 3.0.3 case '3.0.3-RC1': $sql = 'UPDATE ' . LOG_TABLE . " SET log_operation = 'LOG_DELETE_TOPIC' diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index f774090a66..1fd0f96332 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -218,7 +218,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('topics_per_page', 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 ('version', '3.0.3-dev'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.0.3'); 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');