diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2007-07-08 16:39:48 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2007-07-08 16:39:48 +0000 |
| commit | bb7d2f7aad82d8a369d1fe0f5e32aa528bd4367b (patch) | |
| tree | d1045042f004c0d551658e8192b75965139f3707 /phpBB | |
| parent | 7a1b091b0614050eefc7234399b0ec57eef3a8e3 (diff) | |
| download | forums-bb7d2f7aad82d8a369d1fe0f5e32aa528bd4367b.tar forums-bb7d2f7aad82d8a369d1fe0f5e32aa528bd4367b.tar.gz forums-bb7d2f7aad82d8a369d1fe0f5e32aa528bd4367b.tar.bz2 forums-bb7d2f7aad82d8a369d1fe0f5e32aa528bd4367b.tar.xz forums-bb7d2f7aad82d8a369d1fe0f5e32aa528bd4367b.zip | |
changes...
git-svn-id: file:///svn/phpbb/trunk@7842 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/install/convertors/convert_phpbb20.php | 2 | ||||
| -rw-r--r-- | phpBB/install/database_update.php | 4 | ||||
| -rw-r--r-- | phpBB/install/install_update.php | 4 | ||||
| -rw-r--r-- | phpBB/install/schemas/schema_data.sql | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php index 573825b7bb..2a542dd6fa 100644 --- a/phpBB/install/convertors/convert_phpbb20.php +++ b/phpBB/install/convertors/convert_phpbb20.php @@ -31,7 +31,7 @@ unset($dbpasswd); */ $convertor_data = array( 'forum_name' => 'phpBB 2.0.x', - 'version' => '1.0.RC2', + 'version' => '1.0.RC3', 'phpbb_version' => '3.0.0', 'author' => '<a href="http://www.phpbb.com/">phpBB Group</a>', 'dbms' => $dbms, diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index 92f2c1d6bd..fc5851804c 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -8,7 +8,7 @@ * */ -$updates_to_version = '3.0.RC2'; +$updates_to_version = '3.0.RC3'; if (defined('IN_PHPBB') && defined('IN_INSTALL')) { @@ -663,7 +663,7 @@ if (version_compare($current_version, '3.0.RC2', '<=')) $index_list = sql_list_index($map_dbms, ACL_ROLES_DATA_TABLE); - if (in_array('ath_opt_id', $index)) + if (in_array('ath_opt_id', $index_list)) { sql_index_drop($map_dbms, 'ath_opt_id', ACL_ROLES_DATA_TABLE); sql_create_index($map_dbms, 'ath_op_id', ACL_ROLES_DATA_TABLE, array('auth_option_id')); diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php index e6fdddf0a2..bf1912076f 100644 --- a/phpBB/install/install_update.php +++ b/phpBB/install/install_update.php @@ -462,11 +462,11 @@ class install_update extends module } } - $cache->purge(); - $db->sql_return_on_error(true); $db->sql_query('DELETE FROM ' . CONFIG_TABLE . " WHERE config_name = 'version_update_from'"); $db->sql_return_on_error(false); + + $cache->purge(); } break; diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index 72818dd09e..81e8c3cf80 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -205,7 +205,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.RC3-dev'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.0.RC3'); 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'); |