MDL-19820 Converted all print_footer() calls

diff --git a/question/addquestion.php b/question/addquestion.php
index 95402597fd839462d7909d4fce33beac694a5550..cdba0607ecc2b7e53dd2be5d6cb161b32d119955 100644 (file)
--- 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 e999edd9d69e5c20c471559fa1ed405d19461234..345a7addb1016a38ddf692493f63f936a18b6619 100644 (file)
--- 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 fcae76c0bebcc6ff6d64ccb2656e266a7262cfc1..f742b2db2fb96d3b41856a31e679a8d02ad9ec80 100644 (file)
--- 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 ae2c01af349d4d5602cbe99637b5af98f05f750f..f2fa3fefe9073426dbda86ca1a5c932172ec99e6 100644 (file)
--- 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 1c891a45d8b192b0d83a4b9d17267da0337f1243..0b8b731c4eef55511228c569b58b770d76ae6995 100644 (file)
--- 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 3ad786f4151c084aff08894c7f452d8cae551f78..8d0f70e8ddcf4761d79c2ebd6aa6317bbd93ce59 100644 (file)
--- 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 67c265a58cbe7b55cb78d03ae934a898f08b7a8c..7009f710694946764132879e2ce098e52d2f64e5 100644 (file)
--- 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 dd1207679691e9d637baf4cb28a3ee5b9b3f08a4..d02394e2e10bbda46e295e37ebf841ba2eb1551a 100644 (file)
--- 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 195861c618bbb69786e3a9aa8db8e95303ba4bdc..d1d30c072360b6f06eee83e9bdb9758cc76984a6 100644 (file)
--- 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 82da2e4517e841f18b852188e8d10395ccfd467c..c6935cbfd94be251dbe7e53d3858d1036bbbafcf 100644 (file)
--- 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&courseid={$course->id}",
                 "edit.php?courseid={$course->id}");
-            print_footer($course);
+            echo $OUTPUT->footer();
             exit;
         }