aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acp/acp_users.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2007-09-26 16:53:40 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2007-09-26 16:53:40 +0000
commitb2afdc0704e2c827e0174a113ea105a551b15039 (patch)
tree289484d37171c07a1877d38515e0bb87c96b6995 /phpBB/includes/acp/acp_users.php
parentcb85c2c57cd7d6bfd93950f993125d4a6771e65e (diff)
downloadforums-b2afdc0704e2c827e0174a113ea105a551b15039.tar
forums-b2afdc0704e2c827e0174a113ea105a551b15039.tar.gz
forums-b2afdc0704e2c827e0174a113ea105a551b15039.tar.bz2
forums-b2afdc0704e2c827e0174a113ea105a551b15039.tar.xz
forums-b2afdc0704e2c827e0174a113ea105a551b15039.zip
#i53
git-svn-id: file:///svn/phpbb/trunk@8113 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/acp/acp_users.php')
-rw-r--r--phpBB/includes/acp/acp_users.php21
1 files changed, 20 insertions, 1 deletions
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php
index 3748dbaaf9..a3dd9e279b 100644
--- a/phpBB/includes/acp/acp_users.php
+++ b/phpBB/includes/acp/acp_users.php
@@ -1541,6 +1541,23 @@ class acp_users
if ($deletemark && sizeof($marked))
{
+ $sql = 'SELECT attach_id
+ FROM ' . ATTACHMENTS_TABLE . '
+ WHERE poster_id = ' . $user_id . '
+ AND is_orphan = 0
+ AND ' . $db->sql_in_set('attach_id', $marked);
+ $result = $db->sql_query($sql);
+
+ $marked = array();
+ while ($row = $db->sql_fetchrow($result))
+ {
+ $marked[] = $row['attach_id'];
+ }
+ $db->sql_freeresult($result);
+ }
+
+ if ($deletemark && sizeof($marked))
+ {
if (confirm_box(true))
{
$sql = 'SELECT real_filename
@@ -1603,7 +1620,8 @@ class acp_users
$sql = 'SELECT COUNT(attach_id) as num_attachments
FROM ' . ATTACHMENTS_TABLE . "
- WHERE poster_id = $user_id";
+ WHERE poster_id = $user_id
+ AND is_orphan = 0";
$result = $db->sql_query_limit($sql, 1);
$num_attachments = (int) $db->sql_fetchfield('num_attachments');
$db->sql_freeresult($result);
@@ -1615,6 +1633,7 @@ class acp_users
LEFT JOIN ' . PRIVMSGS_TABLE . ' p ON (a.post_msg_id = p.msg_id
AND a.in_message = 1)
WHERE a.poster_id = ' . $user_id . "
+ AND a.is_orphan = 0
ORDER BY $order_by";
$result = $db->sql_query_limit($sql, $config['posts_per_page'], $start);