merged fix for MDL-6895, adding optional param

diff --git a/grade/index.php b/grade/index.php
index 75d87d33b598dabf21e6c5086eb0a01ade40d9d1..13b5e27aaa5d96ac6ba5af8365a75c36c0fd910d 100644 (file)
--- a/grade/index.php
+++ b/grade/index.php
@@ -7,6 +7,7 @@
     $user     = optional_param('user', -1);
     $group    = optional_param('group', -1);
     $action   = optional_param('action', 'grades');
+    $cview    = optional_param('cview', -1);
 
     if (!$course = get_record('course', 'id', $id)) {
         error('No course ID');

diff --git a/grade/lib.php b/grade/lib.php
index 56662634f3ff7759ac4a82451cfa70aeec2ad4f0..30c9b7f0a59704294b4dd7fa8a99f5786b239a2e 100644 (file)
--- a/grade/lib.php
+++ b/grade/lib.php
@@ -3019,6 +3019,6 @@ function grade_get_course_students($courseid) {
         notify ('no roles defined in admin->appearance->graderoles');
         return false; // no roles to displayreturn false;  
     }
-    return $students;
+    return isset($students)?$students:'';
 }
 ?>