aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2007-06-08 08:26:05 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2007-06-08 08:26:05 +0000
commit011b47c01deded9e8e933cd1ca48fa4cec557ee5 (patch)
tree94aa36da775ceeb3499767142b1fb6613a4cd66b
parent3dc51a99c160a599afeb2d8fb739407dfb382124 (diff)
downloadforums-011b47c01deded9e8e933cd1ca48fa4cec557ee5.tar
forums-011b47c01deded9e8e933cd1ca48fa4cec557ee5.tar.gz
forums-011b47c01deded9e8e933cd1ca48fa4cec557ee5.tar.bz2
forums-011b47c01deded9e8e933cd1ca48fa4cec557ee5.tar.xz
forums-011b47c01deded9e8e933cd1ca48fa4cec557ee5.zip
fix bug #12135 with the patch provided by APTX
git-svn-id: file:///svn/phpbb/trunk@7725 89ea8834-ac86-4346-8a33-228a782c2dd0
-rw-r--r--phpBB/includes/functions_privmsgs.php6
1 files changed, 2 insertions, 4 deletions
diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php
index 9ce281ba12..00620bbfb7 100644
--- a/phpBB/includes/functions_privmsgs.php
+++ b/phpBB/includes/functions_privmsgs.php
@@ -498,7 +498,7 @@ function place_pm_into_folder(&$global_privmsgs_rules, $release = false)
// We place actions into arrays, to save queries.
$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)
{
@@ -517,9 +517,7 @@ function place_pm_into_folder(&$global_privmsgs_rules, $release = false)
case ACTION_PLACE_INTO_FOLDER:
// Folder actions have precedence, so we will remove any other ones
$folder_action = true;
- $_folder_id = (int) $rule_ary['folder_id'];
- $move_into_folder = array();
- $move_into_folder[$_folder_id][] = $msg_id;
+ $move_into_folder[(int) $rule_ary['folder_id']][] = $msg_id;
$num_new++;
break;