From bae927bebddd13d0d1958fd1605cfe1defe953f9 Mon Sep 17 00:00:00 2001
From: Tim Hunt <T.J.Hunt@open.ac.uk>
Date: Thu, 28 Jul 2011 11:16:37 +0100
Subject: [PATCH] MDL-28507 fix bad lang string uses, and remove two obsolete
 strings.

---
 local/qeupgradehelper/afterupgradelib.php          | 2 +-
 mod/quiz/db/upgrade.php                            | 6 +++---
 mod/quiz/report/overview/lang/en/quiz_overview.php | 2 --
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/local/qeupgradehelper/afterupgradelib.php b/local/qeupgradehelper/afterupgradelib.php
index e1ac51305dc52..f6dce5dc4b8c7 100644
--- a/local/qeupgradehelper/afterupgradelib.php
+++ b/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));
     }
diff --git a/mod/quiz/db/upgrade.php b/mod/quiz/db/upgrade.php
index 7830630eb46b4..6319c9fec7621 100644
--- a/mod/quiz/db/upgrade.php
+++ b/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));
                 }
             }
diff --git a/mod/quiz/report/overview/lang/en/quiz_overview.php b/mod/quiz/report/overview/lang/en/quiz_overview.php
index 367ec4e1631b7..70af921df4f9f 100644
--- a/mod/quiz/report/overview/lang/en/quiz_overview.php
+++ b/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';