diff --git a/course/category.php b/course/category.php
index 7c517503046..31653847588 100644
--- a/course/category.php
+++ b/course/category.php
@@ -446,5 +446,5 @@
 
     print_course_search();
 
-    print_footer();
+    echo $OUTPUT->footer();
 
diff --git a/course/delete.php b/course/delete.php
index 16b7a877513..bfc3acf33e9 100644
--- a/course/delete.php
+++ b/course/delete.php
@@ -46,7 +46,7 @@
                      "delete.php?id=$course->id&delete=".md5($course->timemodified)."&sesskey=".sesskey(),
                      "category.php?id=$course->category");
 
-        print_footer();
+        echo $OUTPUT->footer();
         exit;
     }
 
@@ -81,6 +81,6 @@
 
     print_continue("category.php?id=$course->category");
 
-    print_footer();
+    echo $OUTPUT->footer();
 
 ?>
diff --git a/course/edit.php b/course/edit.php
index 904da6a6e2e..dcd04cff8c2 100644
--- a/course/edit.php
+++ b/course/edit.php
@@ -146,6 +146,6 @@
 
     $editform->display();
 
-    print_footer($course);
+    echo $OUTPUT->footer();
 
 ?>
diff --git a/course/editcategory.php b/course/editcategory.php
index fa446c1bf07..c3b3a873842 100644
--- a/course/editcategory.php
+++ b/course/editcategory.php
@@ -112,5 +112,5 @@ echo $OUTPUT->heading($strtitle);
 
 $mform->display();
 
-print_footer();
+echo $OUTPUT->footer();
 ?>
diff --git a/course/editsection.php b/course/editsection.php
index 15d660c8b52..50c0bb86329 100644
--- a/course/editsection.php
+++ b/course/editsection.php
@@ -54,6 +54,6 @@
 
     print_heading_with_help($strsummaryof, 'summaries');
     $mform->display();
-    print_footer($course);
+    echo $OUTPUT->footer();
 
 
diff --git a/course/import.php b/course/import.php
index 4853bb66402..76c63123400 100644
--- a/course/import.php
+++ b/course/import.php
@@ -45,5 +45,5 @@
         echo '</div>';
     }
 
-    print_footer();
+    echo $OUTPUT->footer();
 ?>
diff --git a/course/import/activities/index.php b/course/import/activities/index.php
index 0b497e4d4bd..df33fff667b 100644
--- a/course/import/activities/index.php
+++ b/course/import/activities/index.php
@@ -68,5 +68,5 @@
     print_header("$course->shortname: $strimportactivities", $course->fullname, $navigation);
     require_once('mod.php');
 
-    print_footer();
+    echo $OUTPUT->footer();
 ?>
diff --git a/course/import/groups/index.php b/course/import/groups/index.php
index 2dda3612c0b..0c2d9798019 100755
--- a/course/import/groups/index.php
+++ b/course/import/groups/index.php
@@ -197,7 +197,7 @@
 /// Print the form
     require('mod.php');
 
-    print_footer($course);
+    echo $OUTPUT->footer();
 
 function my_file_get_contents($filename, $use_include_path = 0) {
 /// Returns the file as one big long string
diff --git a/course/importstudents.php b/course/importstudents.php
index b63a96f0186..dc56aa2f072 100644
--- a/course/importstudents.php
+++ b/course/importstudents.php
@@ -126,6 +126,6 @@
 
     print_simple_box_end();
 
-    print_footer();
+    echo $OUTPUT->footer();
 
 ?>
diff --git a/course/info.php b/course/info.php
index cbb1d0fc550..fc38200b4f4 100644
--- a/course/info.php
+++ b/course/info.php
@@ -87,6 +87,6 @@
 
     echo $OUTPUT->close_window_button();
 
-    print_footer();
+    echo $OUTPUT->footer();
 
 ?>
diff --git a/course/lib.php b/course/lib.php
index 85385cdb69b..0146ee9da43 100644
--- a/course/lib.php
+++ b/course/lib.php
@@ -270,12 +270,12 @@ function build_logs_array($course, $user=0, $date=0, $order="l.time ASC", $limit
 function print_log($course, $user=0, $date=0, $order="l.time ASC", $page=0, $perpage=100,
                    $url="", $modname="", $modid=0, $modaction="", $groupid=0) {
 
-    global $CFG, $DB;
+    global $CFG, $DB, $OUTPUT;
 
     if (!$logs = build_logs_array($course, $user, $date, $order, $page*$perpage, $perpage,
                        $modname, $modid, $modaction, $groupid)) {
         notify("No logs found!");
-        print_footer($course);
+        echo $OUTPUT->footer();
         exit;
     }
 
@@ -391,12 +391,12 @@ function print_log($course, $user=0, $date=0, $order="l.time ASC", $page=0, $per
 function print_mnet_log($hostid, $course, $user=0, $date=0, $order="l.time ASC", $page=0, $perpage=100,
                    $url="", $modname="", $modid=0, $modaction="", $groupid=0) {
 
-    global $CFG, $DB;
+    global $CFG, $DB, $OUTPUT;
 
     if (!$logs = build_mnet_logs_array($hostid, $course, $user, $date, $order, $page*$perpage, $perpage,
                        $modname, $modid, $modaction, $groupid)) {
         notify("No logs found!");
-        print_footer($course);
+        echo $OUTPUT->footer();
         exit;
     }
 
diff --git a/course/mod.php b/course/mod.php
index 054e5b30a7c..e73795613d6 100644
--- a/course/mod.php
+++ b/course/mod.php
@@ -70,7 +70,7 @@
             print_simple_box_start('center', '60%', '#FFAAAA', 20, 'noticebox');
             notice_yesno($strdeletecheckfull, 'mod.php', $return, $optionsyes, $optionsno, 'post', 'get');
             print_simple_box_end();
-            print_footer($course);
+            echo $OUTPUT->footer();
 
             exit;
         }
diff --git a/course/modedit.php b/course/modedit.php
index 924b7f9c391..912268ccd9c 100644
--- a/course/modedit.php
+++ b/course/modedit.php
@@ -584,5 +584,5 @@
 
         print_heading_with_help($pageheading, 'mods', $module->name, $icon);
         $mform->display();
-        print_footer($course);
+        echo $OUTPUT->footer();
     }
diff --git a/course/recent.php b/course/recent.php
index bae1101d089..dd1af297e38 100644
--- a/course/recent.php
+++ b/course/recent.php
@@ -261,7 +261,7 @@
 
     }
 
-    print_footer($course);
+    echo $OUTPUT->footer();
 
 function compare_activities_by_time_desc($a, $b) {
     // make sure the activities actually have a timestamp property
diff --git a/course/report.php b/course/report.php
index 078b4ffbb55..753a91265c2 100644
--- a/course/report.php
+++ b/course/report.php
@@ -39,5 +39,5 @@
         }
     }
 
-    print_footer();
+    echo $OUTPUT->footer();
 ?>
diff --git a/course/report/log/index.php b/course/report/log/index.php
index 39232cb7301..299f8c5713a 100644
--- a/course/report/log/index.php
+++ b/course/report/log/index.php
@@ -103,21 +103,21 @@
                 if (!print_log_csv($course, $user, $date, 'l.time DESC', $modname,
                         $modid, $modaction, $group)) {
                     notify("No logs found!");
-                    print_footer($course);
+                    echo $OUTPUT->footer();
                 }
                 exit;
             case 'downloadasods':
                 if (!print_log_ods($course, $user, $date, 'l.time DESC', $modname,
                         $modid, $modaction, $group)) {
                     notify("No logs found!");
-                    print_footer($course);
+                    echo $OUTPUT->footer();
                 }
                 exit;
             case 'downloadasexcel':
                 if (!print_log_xls($course, $user, $date, 'l.time DESC', $modname,
                         $modid, $modaction, $group)) {
                     notify("No logs found!");
-                    print_footer($course);
+                    echo $OUTPUT->footer();
                 }
                 exit;
         }
@@ -139,7 +139,7 @@
         print_log_selector_form($course, $user, $date, $modname, $modid, $modaction, $group, $showcourses, $showusers, $logformat);
     }
 
-    print_footer($course);
+    echo $OUTPUT->footer();
 
     exit;
 ?>
diff --git a/course/report/log/indexlive.php b/course/report/log/indexlive.php
index c0d909721af..43a557023a6 100644
--- a/course/report/log/indexlive.php
+++ b/course/report/log/indexlive.php
@@ -38,6 +38,6 @@
     link_to_popup_window('/course/report/log/live.php?id='. $course->id,'livelog', get_string('livelogs'), 500, 800);
     echo '<div>';
 
-    print_footer($course);
+    echo $OUTPUT->footer();
 
 ?>
diff --git a/course/report/outline/index.php b/course/report/outline/index.php
index fe949fa1067..1da10bd94cb 100644
--- a/course/report/outline/index.php
+++ b/course/report/outline/index.php
@@ -111,7 +111,7 @@
     }
     echo '</table>';
 
-    print_footer($course);
+    echo $OUTPUT->footer();
 
 
 ?>
diff --git a/course/report/participation/index.php b/course/report/participation/index.php
index 1a63b90e297..ad1f0b76a16 100644
--- a/course/report/participation/index.php
+++ b/course/report/participation/index.php
@@ -289,6 +289,6 @@
 
     }
 
-    print_footer();
+    echo $OUTPUT->footer();
 
 ?>
diff --git a/course/report/progress/index.php b/course/report/progress/index.php
index 6bbb2b6e6f4..42e0ed649d0 100644
--- a/course/report/progress/index.php
+++ b/course/report/progress/index.php
@@ -133,7 +133,7 @@ if(!$csv) {
     if(count($progress->users)==0) {
         print '<p class="nousers">'.get_string('err_nousers','completion').'</p>';
         print '<p><a href="'.$reportsurl.'">'.get_string('continue').'</a></p>';
-        print_footer($course);
+        echo $OUTPUT->footer();
         exit;
     }
     print $pagingbar;
@@ -274,5 +274,5 @@ print '<ul class="progress-actions"><li><a href="index.php?course='.$course->id.
     <li><a href="index.php?course='.$course->id.'&amp;format=excelcsv">'.
     get_string('excelcsvdownload','completion').'</a></li></ul>';
 
-print_footer($course);
+echo $OUTPUT->footer();
 ?>
diff --git a/course/report/stats/index.php b/course/report/stats/index.php
index 73c0c22010a..d74f878db86 100644
--- a/course/report/stats/index.php
+++ b/course/report/stats/index.php
@@ -70,6 +70,6 @@
         }
     }
 
-    print_footer();
+    echo $OUTPUT->footer();
 
 ?>
diff --git a/course/request.php b/course/request.php
index 80bdb8015ae..74577c14263 100644
--- a/course/request.php
+++ b/course/request.php
@@ -94,6 +94,6 @@
     print_header($strtitle, $strtitle, build_navigation($strtitle), $requestform->focus());
     echo $OUTPUT->heading($strtitle);
     $requestform->display();
-    print_footer();
+    echo $OUTPUT->footer();
 
 ?>
diff --git a/course/reset.php b/course/reset.php
index 28abd8037a0..c91e09846bb 100755
--- a/course/reset.php
+++ b/course/reset.php
@@ -68,7 +68,7 @@ if ($mform->is_cancelled()) {
         print_table($table);
 
         print_continue('view.php?id='.$course->id);  // Back to course page
-        print_footer($course);
+        echo $OUTPUT->footer();
         exit;
     }
 }
@@ -79,6 +79,6 @@ echo $OUTPUT->heading($strresetcourse);
 print_simple_box(get_string('resetinfo'), 'center', '60%');
 
 $mform->display();
-print_footer($course);
+echo $OUTPUT->footer();
 
 ?>
diff --git a/course/scales.php b/course/scales.php
index da8e88679df..7da197ef7cd 100644
--- a/course/scales.php
+++ b/course/scales.php
@@ -42,7 +42,7 @@
                 echo text_to_html($scale->description);
                 print_simple_box_end();
                 echo $OUTPUT->close_window_button();
-                print_footer('empty');
+                echo $OUTPUT->footer();
                 exit;
             }
         }
@@ -95,6 +95,6 @@
     }
 
     echo $OUTPUT->close_window_button();
-    print_footer('empty');
+    echo $OUTPUT->footer();
 
 ?>
diff --git a/course/search.php b/course/search.php
index f7a0a7ee7b3..0a90e3ab1f9 100644
--- a/course/search.php
+++ b/course/search.php
@@ -110,7 +110,7 @@
         echo "</p>";
         echo "</center>";
         print_simple_box_end();
-        print_footer();
+        echo $OUTPUT->footer();
         exit;
     }
 
@@ -360,7 +360,7 @@
 
     print_course_search($search);
 
-    print_footer();
+    echo $OUTPUT->footer();
 
    /**
      * Print a list navigation bar
diff --git a/course/unenrol.php b/course/unenrol.php
index cc465a4e800..9a095553eda 100644
--- a/course/unenrol.php
+++ b/course/unenrol.php
@@ -102,6 +102,6 @@
                                       $_SERVER['HTTP_REFERER']);
     }
 
-    print_footer($course);
+    echo $OUTPUT->footer();
 
 ?>
diff --git a/course/user.php b/course/user.php
index a770b1bf3e8..82267b738cf 100644
--- a/course/user.php
+++ b/course/user.php
@@ -34,7 +34,7 @@
     if ($user->deleted) {
         print_header();
         echo $OUTPUT->heading(get_string('userdeleted'));
-        print_footer();
+        echo $OUTPUT->footer();
         die;
     }
 
@@ -330,7 +330,7 @@
     }
 
 
-    print_footer($course);
+    echo $OUTPUT->footer();
 
 
 function print_outline_row($mod, $instance, $result) {
diff --git a/course/view.php b/course/view.php
index 735f16c5c94..4fe089a4654 100644
--- a/course/view.php
+++ b/course/view.php
@@ -255,6 +255,6 @@
     }
 
 
-    print_footer();
+    echo $OUTPUT->footer();
 
 ?>