diff --git a/question/addquestion.php b/question/addquestion.php
index 95402597fd8..cdba0607ecc 100644
--- a/question/addquestion.php
+++ b/question/addquestion.php
@@ -100,5 +100,5 @@ print_box_start('generalbox boxwidthnormal boxaligncenter', 'chooseqtypebox');
 print_choose_qtype_to_add_form($hiddenparams);
 print_box_end();
 
-print_footer($COURSE);
-?>
\ No newline at end of file
+echo $OUTPUT->footer();
+?>
diff --git a/question/category.php b/question/category.php
index e999edd9d69..345a7addb10 100644
--- a/question/category.php
+++ b/question/category.php
@@ -127,5 +127,5 @@
         // display the user interface
         $qcobject->display_user_interface();
     }
-    print_footer($COURSE);
+    echo $OUTPUT->footer();
 ?>
diff --git a/question/contextmove.php b/question/contextmove.php
index fcae76c0beb..f742b2db2fb 100644
--- a/question/contextmove.php
+++ b/question/contextmove.php
@@ -240,5 +240,5 @@
         print_box(get_string('movingcategorynofiles', 'question', $cattomove), 'boxwidthnarrow boxaligncenter generalbox');
     }
     $contextmoveform->display();
-    print_footer($COURSE);
+    echo $OUTPUT->footer();
 ?>
diff --git a/question/contextmoveq.php b/question/contextmoveq.php
index ae2c01af349..f2fa3fefe90 100644
--- a/question/contextmoveq.php
+++ b/question/contextmoveq.php
@@ -240,5 +240,5 @@ if (count($urls)){
     print_box(get_string('movingquestionsnofiles', 'question', $questionsstr), 'boxwidthnarrow boxaligncenter generalbox');
 }
 $contextmoveform->display();
-print_footer($COURSE);
+echo $OUTPUT->footer();
 ?>
diff --git a/question/edit.php b/question/edit.php
index 1c891a45d8b..0b8b731c4ee 100644
--- a/question/edit.php
+++ b/question/edit.php
@@ -77,5 +77,5 @@
             $pagevars['cat'], $pagevars['recurse'], $pagevars['showhidden'], $pagevars['showquestiontext']);
     echo "</div>\n";
 
-    print_footer($COURSE);
+    echo $OUTPUT->footer();
 ?>
diff --git a/question/export.php b/question/export.php
index 3ad786f4151..8d0f70e8ddc 100644
--- a/question/export.php
+++ b/question/export.php
@@ -123,7 +123,7 @@
         }
 
         print_continue('edit.php?' . $thispageurl->get_query_string());
-        print_footer($COURSE);
+        echo $OUTPUT->footer();
         exit;
     }
 
@@ -132,5 +132,5 @@
 
     $export_form->display();
 
-    print_footer($COURSE);
+    echo $OUTPUT->footer();
 ?>
diff --git a/question/import.php b/question/import.php
index 67c265a58cb..7009f710694 100644
--- a/question/import.php
+++ b/question/import.php
@@ -152,7 +152,7 @@
 
             echo "<hr />";
             print_continue("edit.php?".($thispageurl->get_query_string(array('category'=>"{$qformat->category->id},{$qformat->category->contextid}"))));
-            print_footer($COURSE);
+            echo $OUTPUT->footer();
             exit;
         }
     }
@@ -161,6 +161,6 @@
 
     /// Print upload form
     $import_form->display();
-    print_footer($COURSE);
+    echo $OUTPUT->footer();
 
 ?>
diff --git a/question/preview.php b/question/preview.php
index dd120767969..d02394e2e10 100644
--- a/question/preview.php
+++ b/question/preview.php
@@ -241,5 +241,5 @@
      get_string('closepreview', 'quiz') . "\" />";
     echo '</div>';
     echo '</form>';
-    print_footer();
+    echo $OUTPUT->footer();
 ?>
diff --git a/question/question.php b/question/question.php
index 195861c618b..d1d30c07236 100644
--- a/question/question.php
+++ b/question/question.php
@@ -273,6 +273,6 @@ if ($mform->is_cancelled()){
     // Display a heading, question editing form and possibly some extra content needed for
     // for this question type.
     $QTYPES[$question->qtype]->display_question_editing_page($mform, $question, $wizardnow);
-    print_footer($COURSE);
+    echo $OUTPUT->footer();
 }
 ?>
diff --git a/question/type/questiontype.php b/question/type/questiontype.php
index 82da2e4517e..c6935cbfd94 100644
--- a/question/type/questiontype.php
+++ b/question/type/questiontype.php
@@ -291,7 +291,7 @@ class default_questiontype {
     *       is itself an object, shown next to the form fields. (I don't think this is accurate any more.)
     */
     function save_question($question, $form, $course) {
-        global $USER, $DB;
+        global $USER, $DB, $OUTPUT;
         // This default implementation is suitable for most
         // question types.
 
@@ -368,7 +368,7 @@ class default_questiontype {
         if (!empty($result->noticeyesno)) {
             notice_yesno($result->noticeyesno, "question.php?id=$question->id&amp;courseid={$course->id}",
                 "edit.php?courseid={$course->id}");
-            print_footer($course);
+            echo $OUTPUT->footer();
             exit;
         }