aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions_admin.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2009-08-25 09:07:26 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2009-08-25 09:07:26 +0000
commit17f40511bf4df9dd46cd13cbd2c7802c49575783 (patch)
tree96b9183199fed320c786300f44767792ca1fa4da /phpBB/includes/functions_admin.php
parent19bae65f4c79c7f50d71fd57bfff6ff1033ed84b (diff)
downloadforums-17f40511bf4df9dd46cd13cbd2c7802c49575783.tar
forums-17f40511bf4df9dd46cd13cbd2c7802c49575783.tar.gz
forums-17f40511bf4df9dd46cd13cbd2c7802c49575783.tar.bz2
forums-17f40511bf4df9dd46cd13cbd2c7802c49575783.tar.xz
forums-17f40511bf4df9dd46cd13cbd2c7802c49575783.zip
Make sure only logs for existing users are displayed and user-specific logs removed on user deletion. (Bug #49855)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10053 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions_admin.php')
-rw-r--r--phpBB/includes/functions_admin.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php
index a021717f57..205d7046c7 100644
--- a/phpBB/includes/functions_admin.php
+++ b/phpBB/includes/functions_admin.php
@@ -2744,8 +2744,9 @@ function view_log($mode, &$log, &$log_count, $limit = 0, $offset = 0, $forum_id
}
$sql = 'SELECT COUNT(l.log_id) AS total_entries
- FROM ' . LOG_TABLE . " l
+ FROM ' . LOG_TABLE . ' l, ' . USERS_TABLE . " u
WHERE l.log_type = $log_type
+ AND l.user_id = u.user_id
AND l.log_time >= $limit_days
$sql_keywords
$sql_forum";