aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2008-11-08 20:02:22 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2008-11-08 20:02:22 +0000
commitc185c3b64bcba881f723eb2ea9fee35afe9c29ec (patch)
tree39e60b45b16a506d9ad2d9da6223ec12b800b2af
parent538acb3db5e91f983849cd70fa754bb29ee364a0 (diff)
downloadforums-c185c3b64bcba881f723eb2ea9fee35afe9c29ec.tar
forums-c185c3b64bcba881f723eb2ea9fee35afe9c29ec.tar.gz
forums-c185c3b64bcba881f723eb2ea9fee35afe9c29ec.tar.bz2
forums-c185c3b64bcba881f723eb2ea9fee35afe9c29ec.tar.xz
forums-c185c3b64bcba881f723eb2ea9fee35afe9c29ec.zip
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
-rw-r--r--phpBB/includes/constants.php2
-rw-r--r--phpBB/install/database_update.php7
-rw-r--r--phpBB/install/schemas/schema_data.sql2
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');