aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions_privmsgs.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2006-06-17 11:28:21 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2006-06-17 11:28:21 +0000
commit10846d462ac9aa4790157f02e6cbf76297c29b82 (patch)
treebafc6eb7aac2f104cfa055163b2def8b65887ac6 /phpBB/includes/functions_privmsgs.php
parentf04a3349e66984506ab71f0506d718188022e03f (diff)
downloadforums-10846d462ac9aa4790157f02e6cbf76297c29b82.tar
forums-10846d462ac9aa4790157f02e6cbf76297c29b82.tar.gz
forums-10846d462ac9aa4790157f02e6cbf76297c29b82.tar.bz2
forums-10846d462ac9aa4790157f02e6cbf76297c29b82.tar.xz
forums-10846d462ac9aa4790157f02e6cbf76297c29b82.zip
fix bugs #2271 and #2273
git-svn-id: file:///svn/phpbb/trunk@6081 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions_privmsgs.php')
-rw-r--r--phpBB/includes/functions_privmsgs.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php
index a8d0932d2a..7a9cdfb322 100644
--- a/phpBB/includes/functions_privmsgs.php
+++ b/phpBB/includes/functions_privmsgs.php
@@ -387,7 +387,8 @@ function place_pm_into_folder(&$global_privmsgs_rules, $release = false)
{
$sql = 'SELECT *
FROM ' . USER_GROUP_TABLE . '
- WHERE user_id IN (' . implode(', ', $user_ids) . ')';
+ WHERE user_id IN (' . implode(', ', $user_ids) . ')
+ AND user_pending = 0';
$result = $db->sql_query($sql);
while ($row = $db->sql_fetchrow($result))