From a2ddd957f2562ba6496f34c47192a657d3969e83 Mon Sep 17 00:00:00 2001 From: mjollnir_ Date: Thu, 25 Nov 2004 21:56:32 +0000 Subject: [PATCH] Merged from MOODLE_14_STABLE: In get logs don't join on the user table for just counting the records --- lib/datalib.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/datalib.php b/lib/datalib.php index 9ae6b30a72..39e0dcf196 100644 --- a/lib/datalib.php +++ b/lib/datalib.php @@ -2657,7 +2657,9 @@ function get_logs($select, $order='l.time DESC', $limitfrom='', $limitnum='', &$ } $selectsql = $CFG->prefix .'log l LEFT JOIN '. $CFG->prefix .'user u ON l.userid = u.id '. ((strlen($select) > 0) ? 'WHERE '. $select : ''); - $totalcount = count_records_sql('SELECT COUNT(*) FROM '. $selectsql); + $countsql = $CFG->prefix.'log l '.((strlen($select) > 0) ? ' WHERE '. $select : ''); + + $totalcount = count_records_sql("SELECT COUNT(*) FROM $countsql"); return get_records_sql('SELECT l.*, u.firstname, u.lastname, u.picture FROM '. $selectsql .' '. $order .' '. $limit); -- 2.39.5