Merge branch 'MDL-41092-master' of git://github.com/ankitagarwal/moodle

nealpowell · Nov 1, 2013 · bb1a600 · bb1a600
2 parents 4d2bd67 + 9f3da40
commit bb1a600
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/mod/assign/locallib.php b/mod/assign/locallib.php
@@ -1560,8 +1560,8 @@ public static function cron() {
         $timenow   = time();
 
         // Collect all submissions from the past 24 hours that require mailing.
-        $sql = 'SELECT a.course, a.name, a.blindmarking, a.revealidentities,
-                       g.*, g.id as gradeid, g.timemodified as lastmodified
+        $sql = 'SELECT g.id as gradeid, a.course, a.name, a.blindmarking, a.revealidentities,
+                       g.*, g.timemodified as lastmodified
                  FROM {assign} a
                  JOIN {assign_grades} g ON g.assignment = a.id
                  LEFT JOIN {assign_user_flags} uf ON uf.assignment = a.id AND uf.userid = g.userid