aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/install
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2006-12-15 14:54:52 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2006-12-15 14:54:52 +0000
commit2e4cd16058cc548068a94047c9c31e5a9ad272d0 (patch)
tree5e2bceadc56306b886482703702b0f21a0aba3a1 /phpBB/install
parent11e70be6edd39fb0956541117e8bf327c94f651e (diff)
downloadforums-2e4cd16058cc548068a94047c9c31e5a9ad272d0.tar
forums-2e4cd16058cc548068a94047c9c31e5a9ad272d0.tar.gz
forums-2e4cd16058cc548068a94047c9c31e5a9ad272d0.tar.bz2
forums-2e4cd16058cc548068a94047c9c31e5a9ad272d0.tar.xz
forums-2e4cd16058cc548068a94047c9c31e5a9ad272d0.zip
- fixed bug within the database update script
- #6254 - #6242 - #6184 - #6160 - #6020 git-svn-id: file:///svn/phpbb/trunk@6770 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/install')
-rw-r--r--phpBB/install/database_update.php4
-rw-r--r--phpBB/install/schemas/schema_data.sql4
2 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 5717dbc4d2..ae52373609 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -488,7 +488,7 @@ flush();
$no_updates = true;
// some code magic
-if (version_compare($current_version, '3.0.b3', '<'))
+if (version_compare($current_version, '3.0.b3', '<='))
{
// Set group_founder_manage for administrators group
$sql = 'SELECT group_id
@@ -510,7 +510,7 @@ if (version_compare($current_version, '3.0.b3', '<'))
$no_updates = false;
}
-if (version_compare($current_version, '3.0.b4', '<'))
+if (version_compare($current_version, '3.0.b4', '<='))
{
// Add config values
set_config('script_path', '/');
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index abc6021deb..9bc38ab00e 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -471,13 +471,13 @@ INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT
INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 16, auth_option_id, 0 FROM phpbb_acl_options WHERE auth_option = 'f_';
# Read Only Access (f_)
-INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 17, auth_option_id, 1 FROM phpbb_acl_options WHERE auth_option LIKE 'f_%' AND auth_option IN ('f_', 'f_download', 'f_list', 'f_read', 'f_search', 'f_subscribe');
+INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 17, auth_option_id, 1 FROM phpbb_acl_options WHERE auth_option LIKE 'f_%' AND auth_option IN ('f_', 'f_download', 'f_list', 'f_read', 'f_search', 'f_subscribe', 'f_print');
# Limited Access (f_)
INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 18, auth_option_id, 1 FROM phpbb_acl_options WHERE auth_option LIKE 'f_%' AND auth_option NOT IN ('f_announce', 'f_attach', 'f_bump', 'f_delete', 'f_flash', 'f_icons', 'f_ignoreflood', 'f_poll', 'f_sticky', 'f_user_lock', 'f_votechg');
# Bot Access (f_)
-INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 19, auth_option_id, 1 FROM phpbb_acl_options WHERE auth_option LIKE 'f_%' AND auth_option IN ('f_', 'f_download', 'f_list', 'f_read');
+INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 19, auth_option_id, 1 FROM phpbb_acl_options WHERE auth_option LIKE 'f_%' AND auth_option IN ('f_', 'f_download', 'f_list', 'f_read', 'f_print');
# On Moderation Queue (f_)
INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 20, auth_option_id, 1 FROM phpbb_acl_options WHERE auth_option LIKE 'f_%' AND auth_option NOT IN ('f_announce', 'f_bump', 'f_delete', 'f_flash', 'f_icons', 'f_ignoreflood', 'f_poll', 'f_sticky', 'f_user_lock', 'f_votechg', 'f_noapprove');