Skip to content
Browse files

MDL-27920 gradebook: fixes following integration review

  • Loading branch information...
1 parent 2558ce3 commit 1a20976561572ea51c41112bcf711e02e66cb690 @andyjdavis andyjdavis committed
Showing with 2 additions and 3 deletions.
  1. +1 −2 grade/export/xml/index.php
  2. +1 −1 grade/lib.php
View
3 grade/export/xml/index.php
@@ -58,8 +58,7 @@
$export->process_form($data);
$export->print_continue();
- $require_user_idnumber = true; //skip users without idnumber as they cannot be identified when importing
- $export->display_preview($require_user_idnumber);
+ $export->display_preview(true); //true == skip users without idnumber as they cannot be identified when importing
echo $OUTPUT->container(get_string('useridnumberwarning','gradeexport_xml'), 'useridnumberwarning mdl-align');
echo $OUTPUT->footer();
View
2 grade/lib.php
@@ -275,7 +275,7 @@ function _push($grade) {
function _pop() {
global $DB;
if (empty($this->gradestack)) {
- if (!$this->grades_rs) {
+ if (empty($this->grades_rs) || !$this->grades_rs->valid()) {
return null; // no grades present
}

0 comments on commit 1a20976

Please sign in to comment.
Something went wrong with that request. Please try again.