diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2010-07-08 03:06:41 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2010-07-08 03:06:41 +0200 |
| commit | 31b221ae913c49fa2e2a776bd9fd54659728fcd0 (patch) | |
| tree | 01cf1ee53c1203df718f1ef4916dec670d32a3ff /phpBB/install/database_update.php | |
| parent | dea1d660fb63b07451f1a43310de359251462644 (diff) | |
| parent | c79df9700df8fb238ae386e890dd97316bb97fc6 (diff) | |
| download | forums-31b221ae913c49fa2e2a776bd9fd54659728fcd0.tar forums-31b221ae913c49fa2e2a776bd9fd54659728fcd0.tar.gz forums-31b221ae913c49fa2e2a776bd9fd54659728fcd0.tar.bz2 forums-31b221ae913c49fa2e2a776bd9fd54659728fcd0.tar.xz forums-31b221ae913c49fa2e2a776bd9fd54659728fcd0.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/9712] Future dates can be formatted as 'less than one minute ago'
[ticket/9659] Signature options in set_user_options
[ticket/9703] Correct database leak where deleting user did not rm some PM data
[ticket/9697] Backlink broken when the select parent forum does not exist.
[ticket/9695] Correct the improper display of user input in mcp_ban.php
[ticket/9628] _add_module 'after'-parameter does not work correctly.
[ticket/9578] ACP Posting tab is missing "Post settings" module.
Diffstat (limited to 'phpBB/install/database_update.php')
| -rw-r--r-- | phpBB/install/database_update.php | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index 47d261dc46..9d690cb2f1 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -685,7 +685,6 @@ function _add_modules($modules_to_install) WHERE module_class = '" . $db->sql_escape($module_data['class']) . "' AND parent_id = {$parent_id} AND left_id BETWEEN {$first_left_id} AND {$module_row['left_id']} - GROUP BY left_id ORDER BY left_id"; $result = $db->sql_query($sql); $steps = (int) $db->sql_fetchfield('num_modules'); @@ -1684,6 +1683,19 @@ function change_database_data(&$no_updates, $version) } $db->sql_freeresult($result); + // Install modules + $modules_to_install = array( + 'post' => array( + 'base' => 'board', + 'class' => 'acp', + 'title' => 'ACP_POST_SETTINGS', + 'auth' => 'acl_a_board', + 'cat' => 'ACP_MESSAGES', + 'after' => array('message', 'ACP_MESSAGE_SETTINGS') + ), + ); + + _add_modules($modules_to_install); $no_updates = false; break; |