--- ../moodle/moodle/mod/assignment/lib.php	2011-03-04 01:03:36.000000000 +0100
+++ lib.php	2011-05-05 13:18:57.169786164 +0200
@@ -750,8 +750,8 @@
                 $nextid = required_param('nextid', PARAM_INT);
                 $id = required_param('id', PARAM_INT);
                 $offset = (int)$offset+1;
-                //$this->display_submission($offset+1 , $nextid);
-                redirect('submissions.php?id='.$id.'&userid='. $nextid . '&mode=single&offset='.$offset);
+                $filter = required_param('filter', PARAM_INT);
+                redirect('submissions.php?id='.$id.'&userid='. $nextid . '&mode=single&offset='.$offset.'&filter='.$filter);
                 break;
 
             case 'singlenosave':
@@ -958,12 +958,11 @@
                 }
             }
         }
-
         $nextid = 0;
         $where = '';
-        if($filter == 'submitted') {
+        if($filter == '1') {
             $where .= 's.timemodified > 0 AND ';
-        } else if($filter == 'requiregrading') {
+        } else if($filter == '2') {
             $where .= 's.timemarked < s.timemodified AND ';
         }
 
@@ -982,11 +981,9 @@
                 $sort = 'ORDER BY '.$sort.' ';
             }
             $auser = $DB->get_records_sql($select.$sql.$sort, null, $offset, 2);
-
             if (is_array($auser) && count($auser)>1) {
                 $nextuser = next($auser);
             /// Calculate user status
-                $nextuser->status = ($nextuser->timemarked > 0) && ($nextuser->timemarked >= $nextuser->timemodified);
                 $nextid = $nextuser->id;
             }
         }