aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2010-05-14 02:33:52 +0200
committerNils Adermann <naderman@naderman.de>2010-05-14 02:33:52 +0200
commit39770de9213758929c33250a829fcdc53e434ac5 (patch)
treeecb523099f8b916022ed1179405278d6a65ed3c2 /phpBB
parent928fbb012644936de167a465732c041b23a1b615 (diff)
parent823f2571f5443e3529327047f0d50d0955a4be45 (diff)
downloadforums-39770de9213758929c33250a829fcdc53e434ac5.tar
forums-39770de9213758929c33250a829fcdc53e434ac5.tar.gz
forums-39770de9213758929c33250a829fcdc53e434ac5.tar.bz2
forums-39770de9213758929c33250a829fcdc53e434ac5.tar.xz
forums-39770de9213758929c33250a829fcdc53e434ac5.zip
Merge branch 'ticket/bantu/9536' into develop-olympus
* ticket/bantu/9536: [ticket/9536] Small improvement for query against user/session tables when managing users from the ACP.
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/includes/acp/acp_users.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php
index cc196a5869..bd64f1e89e 100644
--- a/phpBB/includes/acp/acp_users.php
+++ b/phpBB/includes/acp/acp_users.php
@@ -105,7 +105,7 @@ class acp_users
LEFT JOIN ' . SESSIONS_TABLE . ' s ON (s.session_user_id = u.user_id)
WHERE u.user_id = ' . $user_id . '
ORDER BY s.session_time DESC';
- $result = $db->sql_query($sql);
+ $result = $db->sql_query_limit($sql, 1);
$user_row = $db->sql_fetchrow($result);
$db->sql_freeresult($result);
@@ -2109,7 +2109,7 @@ class acp_users
LEFT JOIN ' . SESSIONS_TABLE . ' s ON (s.session_user_id = u.user_id)
WHERE u.user_id = ' . $user_id . '
ORDER BY s.session_time DESC';
- $result = $db->sql_query($sql);
+ $result = $db->sql_query_limit($sql, 1);
$user_row = $db->sql_fetchrow($result);
$db->sql_freeresult($result);
}