Minor formatting of timelimit stuff

diff --git a/mod/quiz/mod.html b/mod/quiz/mod.html
index 77d4ffd0679afb6c97fc564fd9d475a7e723c9c9..2d6a9fe6d7d8b28534dfeb0869d9f44248912e90 100644 (file)
--- a/mod/quiz/mod.html
+++ b/mod/quiz/mod.html
@@ -113,9 +113,7 @@
     <td align=right><p><b><?php print_string("timelimit", "quiz") ?>:</b></p></td>
     <td>
     <?php
-        print_timer_selector($form->timelimit);
-        echo "&nbsp;";
-        print_string("minutes","quiz");
+        print_timer_selector($form->timelimit, get_string("minutes","quiz"));
         helpbutton("timelimit", get_string("quiztimer","quiz"), "quiz");
     ?>
     </td>

diff --git a/mod/quiz/view.php b/mod/quiz/view.php
index f79c0380422e63cec4ac30a451ba120cd0a0b230..9e5d3cb50e0b2481b90458a7c2f7e35c3899a2f7 100644 (file)
--- a/mod/quiz/view.php
+++ b/mod/quiz/view.php
@@ -140,12 +140,10 @@
         print_table($table);
     }
 
-    // BEGIN EDIT
-    if($available and $quiz->timelimit) {
-        echo "<p align=\"center\">".get_string("quiztimelimit","quiz", format_time($quiz->timelimit * 60))."</p>";
-    }
-    // END EDIT
     if ($available) {
+        if ($quiz->timelimit) {
+            echo "<p align=\"center\">".get_string("quiztimelimit","quiz", format_time($quiz->timelimit * 60))."</p>";
+        }
         echo "<p align=\"center\">".get_string("quizavailable", "quiz", userdate($quiz->timeclose));
     } else if ($timenow < $quiz->timeopen) {
         echo "<p align=\"center\">".get_string("quiznotavailable", "quiz", userdate($quiz->timeopen));