Merge branch 'MDL-41722-master' of git://github.com/sammarshallou/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 8 Oct 2013 07:19:09 +0000 (15:19 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 8 Oct 2013 07:19:09 +0000 (15:19 +0800)
1  2 
backup/moodle2/backup_stepslib.php

@@@ -209,7 -209,7 +209,7 @@@ abstract class backup_questions_activit
  
          $qas = new backup_nested_element($nameprefix . 'question_attempts');
          $qa = new backup_nested_element($nameprefix . 'question_attempt', array('id'), array(
 -                'slot', 'behaviour', 'questionid', 'maxmark', 'minfraction',
 +                'slot', 'behaviour', 'questionid', 'maxmark', 'minfraction', 'maxfraction',
                  'flagged', 'questionsummary', 'rightanswer', 'responsesummary',
                  'timemodified'));
  
@@@ -1589,7 -1589,8 +1589,8 @@@ class backup_main_structure_step extend
          $info['original_system_contextid'] = context_system::instance()->id;
  
          // Get more information from controller
-         list($dinfo, $cinfo, $sinfo) = backup_controller_dbops::get_moodle_backup_information($this->get_backupid());
+         list($dinfo, $cinfo, $sinfo) = backup_controller_dbops::get_moodle_backup_information(
+                 $this->get_backupid(), $this->get_task()->get_progress());
  
          // Define elements
  
@@@ -1753,7 -1754,8 +1754,8 @@@ class backup_store_backup_file extends 
          $has_file_references = backup_controller_dbops::backup_includes_file_references($this->get_backupid());
          // Perform storage and return it (TODO: shouldn't be array but proper result object)
          return array(
-             'backup_destination' => backup_helper::store_backup_file($this->get_backupid(), $zipfile),
+             'backup_destination' => backup_helper::store_backup_file($this->get_backupid(), $zipfile,
+                     $this->task->get_progress()),
              'include_file_references_to_external_content' => $has_file_references
          );
      }