mirror of
https://github.com/phpbb/phpbb.git
synced 2025-05-12 18:45:20 +02:00
fix bug #12135 with the patch provided by APTX
git-svn-id: file:///svn/phpbb/trunk@7725 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
parent
3dc51a99c1
commit
011b47c01d
@ -498,7 +498,7 @@ function place_pm_into_folder(&$global_privmsgs_rules, $release = false)
|
|||||||
|
|
||||||
// We place actions into arrays, to save queries.
|
// We place actions into arrays, to save queries.
|
||||||
$num_new = $num_unread = 0;
|
$num_new = $num_unread = 0;
|
||||||
$sql = $unread_ids = $delete_ids = $important_ids = array();
|
$sql = $unread_ids = $delete_ids = $important_ids = $move_into_folder = array();
|
||||||
|
|
||||||
foreach ($action_ary as $msg_id => $msg_ary)
|
foreach ($action_ary as $msg_id => $msg_ary)
|
||||||
{
|
{
|
||||||
@ -517,9 +517,7 @@ function place_pm_into_folder(&$global_privmsgs_rules, $release = false)
|
|||||||
case ACTION_PLACE_INTO_FOLDER:
|
case ACTION_PLACE_INTO_FOLDER:
|
||||||
// Folder actions have precedence, so we will remove any other ones
|
// Folder actions have precedence, so we will remove any other ones
|
||||||
$folder_action = true;
|
$folder_action = true;
|
||||||
$_folder_id = (int) $rule_ary['folder_id'];
|
$move_into_folder[(int) $rule_ary['folder_id']][] = $msg_id;
|
||||||
$move_into_folder = array();
|
|
||||||
$move_into_folder[$_folder_id][] = $msg_id;
|
|
||||||
$num_new++;
|
$num_new++;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user