Merged from MOODLE_14_STABLE: In get logs don't join on the user table for just count...

diff --git a/lib/datalib.php b/lib/datalib.php
index 9ae6b30a72d0a72f2df07448830f9ec7ce26fef6..39e0dcf196a2144222b94ac7e6a78a1323456b9a 100644 (file)
--- 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);