Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'MDL-28507' of git://github.com/timhunt/moodle

  • Loading branch information...
commit 48fa0c75b54dedc9bf5760c49e9037ee289e99bb 2 parents 82b8e88 + 35ddcfb
@skodak skodak authored
View
2  local/qeupgradehelper/afterupgradelib.php
@@ -60,7 +60,7 @@ protected function reset_progress($done, $outof) {
gc_collect_cycles(); // This was really helpful in PHP 5.2. Perhaps remove.
$a = new stdClass();
$a->done = $done;
- $a->todo = $outof;
+ $a->outof = $outof;
$this->progressbar->update($done, $outof,
get_string('resettingquizattemptsprogress', 'local_qeupgradehelper', $a));
}
View
6 mod/quiz/db/upgrade.php
@@ -567,16 +567,16 @@ function xmldb_quiz_upgrade($oldversion) {
$pbar = new progress_bar('q15upgrade');
$pbar->create();
$a = new stdClass();
- $a->todo = count($oldattempts);
+ $a->outof = count($oldattempts);
$a->done = 0;
- $pbar->update($a->done, $a->todo,
+ $pbar->update($a->done, $a->outof,
get_string('upgradingveryoldquizattempts', 'quiz', $a));
foreach ($oldattempts as $oldattempt) {
quiz_upgrade_very_old_question_sessions($oldattempt);
$a->done += 1;
- $pbar->update($a->done, $a->todo,
+ $pbar->update($a->done, $a->outof,
get_string('upgradingveryoldquizattempts', 'quiz', $a));
}
}
View
2  mod/quiz/report/overview/lang/en/quiz_overview.php
@@ -26,7 +26,6 @@
$string['allattempts'] = 'Show all attempts';
$string['allattemptscontributetograde'] = 'All attempts contribute to final grade for user.';
$string['allstudents'] = 'Show all {$a}';
-$string['attemptprogress'] = 'Attempt {$a->done} of {$a->todo}';
$string['attemptsonly'] = 'Show {$a} with attempts only';
$string['attemptsprepage'] = 'Attempts shown per page';
$string['deleteselected'] = 'Delete selected attempts';
@@ -56,7 +55,6 @@
$string['preferencespage'] = 'Preferences just for this page';
$string['preferencessave'] = 'Show report';
$string['preferencesuser'] = 'Your preferences for this report';
-$string['qprogress'] = 'Question {$a->done} of {$a->todo}';
$string['regrade'] = 'Regrade';
$string['regradeall'] = 'Regrade all';
$string['regradealldry'] = 'Dry run a full regrade';
Please sign in to comment.
Something went wrong with that request. Please try again.