1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-11 11:13:59 +02:00

Merge branch 'develop' of git://github.com/phpbb/phpbb3 into feature/new-tz-handling

This commit is contained in:
Joas Schilling
2012-07-18 11:07:32 +02:00
124 changed files with 2739 additions and 300 deletions

View File

@@ -2248,6 +2248,21 @@ function change_database_data(&$no_updates, $version)
set_config('search_type', 'phpbb_search_' . $config['search_type']);
}
if (!isset($config['fulltext_postgres_ts_name']))
{
set_config('fulltext_postgres_ts_name', 'simple');
}
if (!isset($config['fulltext_postgres_min_word_len']))
{
set_config('fulltext_postgres_min_word_len', 4);
}
if (!isset($config['fulltext_postgres_max_word_len']))
{
set_config('fulltext_postgres_max_word_len', 254);
}
if (!isset($config['load_jquery_cdn']))
{
set_config('load_jquery_cdn', 0);
@@ -2346,6 +2361,13 @@ function change_database_data(&$no_updates, $version)
'auth' => 'acl_a_styles',
'cat' => 'ACP_STYLE_MANAGEMENT',
),
'autologin_keys' => array(
'base' => 'ucp_profile',
'class' => 'ucp',
'title' => 'UCP_PROFILE_AUTOLOGIN_KEYS',
'auth' => '',
'cat' => 'UCP_PROFILE',
),
);
_add_modules($modules_to_install);