MDL-11665, users with no grade:viewhidden capability gets a wrong upgrade count becau...

diff --git a/grade/report/grader/lib.php b/grade/report/grader/lib.php
index c49c1c4f968941b2eaf042bc00ba727e23f174e4..dfbece75ff6732b6829e521213eeb888a9e2a77b 100644 (file)
--- 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)