diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2010-09-16 22:42:32 +0200 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2010-09-16 22:42:32 +0200 |
| commit | e35711ddde8f5e9f94d4b5145662877619ceecd4 (patch) | |
| tree | 16b5b18a4c14860bccd591d4b8a0d7a2ab833868 /phpBB/install | |
| parent | 4d5d50001d00390b8255da736e67e38d83c8bed5 (diff) | |
| parent | 46810f874758516a8b5ce0fc680f05b612f70f60 (diff) | |
| download | forums-e35711ddde8f5e9f94d4b5145662877619ceecd4.tar forums-e35711ddde8f5e9f94d4b5145662877619ceecd4.tar.gz forums-e35711ddde8f5e9f94d4b5145662877619ceecd4.tar.bz2 forums-e35711ddde8f5e9f94d4b5145662877619ceecd4.tar.xz forums-e35711ddde8f5e9f94d4b5145662877619ceecd4.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/9609] Change header() calls setting HTTP status to send_status_line().
[ticket/9613] Slightly update language strings.
[ticket/9613] Fix missing database part for unread posts search load switch.
[ticket/9613] Implement a load switch for unread posts search feature.
[ticket/9785] Allow users to request new passwords when board is disabled.
[ticket/9644] Check $mode before calling user_notification() from submit_post()
Diffstat (limited to 'phpBB/install')
| -rw-r--r-- | phpBB/install/database_update.php | 3 | ||||
| -rw-r--r-- | phpBB/install/schemas/schema_data.sql | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index 019469b061..8fd96691d9 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -1795,6 +1795,9 @@ function change_database_data(&$no_updates, $version) // Sync the forums we have deleted shadow topics from. sync('forum', 'forum_id', $sync_forum_ids, true, true); + // Unread posts search load switch + set_config('load_unreads_search', '1'); + $no_updates = false; break; } diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index e815615eef..a25b68ba39 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -168,6 +168,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_online_time', INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_onlinetrack', '1'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_search', '1'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_tplcompile', '0'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_unreads_search', '1'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_user_activity', '1'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_attachments', '3'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_attachments_pm', '1'); |