From: toyomoyo <toyomoyo>
Date: Tue, 9 Oct 2007 05:43:35 +0000 (+0000)
Subject: MDL-11665, users with no grade:viewhidden capability gets a wrong upgrade count becau... 
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=b11d9a9139602ea43e4246462f8b577f6dd6bac0;p=moodle.git

MDL-11665, users with no grade:viewhidden capability gets a wrong upgrade count because after deletion of a grade, the grade can be NULL and not hidden at the same time
---

diff --git a/grade/report/grader/lib.php b/grade/report/grader/lib.php
index c49c1c4f96..dfbece75ff 100644
--- a/grade/report/grader/lib.php
+++ b/grade/report/grader/lib.php
@@ -811,7 +811,7 @@ class grade_report_grader extends grade_report {
         } else {
             $now = round(time(), -2); //100 sec gradularity, we need some db caching speedup here
             $hidingsql1 = "AND g.hidden!=1 AND (g.hidden=0 OR g.hidden<$now)";
-            $hidingsql2 = "OR (g.hidden!=1 AND (g.hidden=0 OR g.hidden<$now))";
+            //$hidingsql2 = "OR (g.hidden!=1 AND (g.hidden=0 OR g.hidden<$now))";
         }
 
         $avghtml = '';
@@ -884,7 +884,7 @@ class grade_report_grader extends grade_report {
                          WHERE u.id NOT IN
                            (SELECT userid FROM {$CFG->prefix}grade_grades g
                              WHERE g.itemid = $item->id AND
-                               (g.finalgrade IS NOT NULL $hidingsql2)
+                               (g.finalgrade IS NOT NULL $hidingsql1)
                            )
                            AND u.id IN (
                              SELECT DISTINCT(u.id)