diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-12-18 17:29:39 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-12-18 17:29:39 +0000 |
| commit | 7ca8a4a6626345fa7444cbbbb36b678e31688258 (patch) | |
| tree | adffc2d5616682519b544b1a97058f919d169ae3 /phpBB/includes/ucp/ucp_pm_options.php | |
| parent | 4e5466d276a4c8bb24172b2dc888c8d1a715a04a (diff) | |
| download | forums-7ca8a4a6626345fa7444cbbbb36b678e31688258.tar forums-7ca8a4a6626345fa7444cbbbb36b678e31688258.tar.gz forums-7ca8a4a6626345fa7444cbbbb36b678e31688258.tar.bz2 forums-7ca8a4a6626345fa7444cbbbb36b678e31688258.tar.xz forums-7ca8a4a6626345fa7444cbbbb36b678e31688258.zip | |
- Modules are not added correctly [#6370]
- Minor bug in ucp_prefs_personal.html (Opera) [#6348]
- MCP-Warnings section colspan problem in Opera [#6338]
- Loading extensions on install [#6332]
- Adjust PM rules if folder removed [#6326]
- #6318
- Coppa registration [#6306]
- Quick-Mod Topic Type Changes Fail when Topic == Global [#6228]
- added the possibility to change topic type for more than one topic (within mcp)
git-svn-id: file:///svn/phpbb/trunk@6781 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/ucp/ucp_pm_options.php')
| -rw-r--r-- | phpBB/includes/ucp/ucp_pm_options.php | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/phpBB/includes/ucp/ucp_pm_options.php b/phpBB/includes/ucp/ucp_pm_options.php index da451b999c..fc1bffa5f5 100644 --- a/phpBB/includes/ucp/ucp_pm_options.php +++ b/phpBB/includes/ucp/ucp_pm_options.php @@ -227,6 +227,14 @@ function message_options($id, $mode, $global_privmsgs_rules, $global_rule_condit $user->data['user_full_folder'] = PRIVMSGS_INBOX; } + // Now make sure the folder is not used for rules + // We assign another folder id (the one the messages got moved to) or assign the INBOX (to not have to remove any rule) + $sql = 'UPDATE ' . PRIVMSGS_RULES_TABLE . ' SET rule_folder_id = '; + $sql .= ($remove_action == 1) ? $move_to : PRIVMSGS_INBOX; + $sql .= ' WHERE rule_folder_id = ' . $remove_folder_id; + + $db->sql_query($sql); + $meta_info = append_sid("{$phpbb_root_path}ucp.$phpEx", "i=pm&mode=$mode"); $message = $user->lang['FOLDER_REMOVED']; |