aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/install/database_update.php
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2011-11-01 20:04:08 +0100
committerAndreas Fischer <bantu@phpbb.com>2011-11-01 20:04:08 +0100
commit589f7ac8e4739eca623f53788342f06d5f304163 (patch)
tree0da2a425f72022a02275b402e017253eea573dfb /phpBB/install/database_update.php
parent1dfb52b8052f984edd042410170a7066505e2997 (diff)
parent65a34fd047f4ac1ff3638a568f44d3fe7d664d88 (diff)
downloadforums-589f7ac8e4739eca623f53788342f06d5f304163.tar
forums-589f7ac8e4739eca623f53788342f06d5f304163.tar.gz
forums-589f7ac8e4739eca623f53788342f06d5f304163.tar.bz2
forums-589f7ac8e4739eca623f53788342f06d5f304163.tar.xz
forums-589f7ac8e4739eca623f53788342f06d5f304163.zip
Merge remote-tracking branch 'nickvergessen/ticket/10410' into develop
* nickvergessen/ticket/10410: [ticket/10410] Add option to display users in their first teampage group
Diffstat (limited to 'phpBB/install/database_update.php')
-rw-r--r--phpBB/install/database_update.php8
1 files changed, 6 insertions, 2 deletions
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 3d8dd9d3fa..54737be627 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -2125,10 +2125,9 @@ function change_database_data(&$no_updates, $version)
_sql($sql, $errored, $error_ary);
}
- if (!isset($config['use_system_cron']))
+ if (!isset($config['legend_sort_groupname']))
{
set_config('legend_sort_groupname', '0');
- set_config('teampage_multiple', '1');
set_config('teampage_forums', '1');
}
@@ -2268,6 +2267,11 @@ function change_database_data(&$no_updates, $version)
set_config('load_cpf_pm', '0');
}
+ if (!isset($config['teampage_memberships']))
+ {
+ set_config('teampage_memberships', '1');
+ }
+
$no_updates = false;
break;
}