From 2e099772d9002fbf572f83ccfe403b45ee5f4248 Mon Sep 17 00:00:00 2001 From: Petr Skoda Date: Sat, 21 Jan 2012 16:47:03 +0100 Subject: [PATCH] MDL-31183 fix non-functional glossary_count_unrated_entries() --- mod/glossary/lib.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/mod/glossary/lib.php b/mod/glossary/lib.php index 2c4ac782749..7e462eb6b57 100644 --- a/mod/glossary/lib.php +++ b/mod/glossary/lib.php @@ -2231,24 +2231,24 @@ function glossary_count_unrated_entries($glossaryid, $userid) { // Now we need to count the ratings that this user has made $sql = "SELECT COUNT('x') AS num FROM {glossary_entries} e - JOIN {ratings} r ON r.itemid = e.id + JOIN {rating} r ON r.itemid = e.id WHERE e.glossaryid = :glossaryid AND r.userid = :userid AND r.component = 'mod_glossary' AND r.ratingarea = 'entry' AND r.contextid = :contextid"; - $params = array('glossaryid' => $glossaryid, 'userid' => $userid, 'contextid' => $context->id); + $params = array('glossaryid' => $glossaryid, 'userid' => $userid, 'contextid' => $contextid); $rated = $DB->count_records_sql($sql, $params); if ($rated) { // The number or enties minus the number or rated entries equals the number of unrated // entries - if ($entries->num > $rated->num) { - return $entries->num - $rated->num; + if ($entries > $rated) { + return $entries - $rated; } else { return 0; // Just in case there was a counting error } } else { - return $entries->num; + return (int)$entries; } } else { return 0;