diff --git a/mod/data/comment.php b/mod/data/comment.php
index 413957e1528..e211cbde5ce 100755
--- a/mod/data/comment.php
+++ b/mod/data/comment.php
@@ -117,7 +117,7 @@
                   'comment.php?rid='.$record->id.'&commentid='.$comment->id.'&page='.$page.
                               '&sesskey='.sesskey().'&mode=delete&confirm=1',
                   'view.php?rid='.$record->id.'&page='.$page);
-                print_footer();
+                echo $OUTPUT->footer();
             }
             die;
         break;
@@ -126,7 +126,7 @@
 
     print_header();
     data_print_comments($data, $record, $page, $mform);
-    print_footer();
+    echo $OUTPUT->footer();
 
 
 ?>
diff --git a/mod/data/edit.php b/mod/data/edit.php
index 981ddb1f196..dc6af0c908f 100755
--- a/mod/data/edit.php
+++ b/mod/data/edit.php
@@ -187,7 +187,7 @@
 
             if (data_atmaxentries($data) and !has_capability('mod/data:manageentries',$context)){
                 notify (get_string('atmaxentry','data'));
-                print_footer($course);
+                echo $OUTPUT->footer();
                 exit;
             }
 
@@ -347,5 +347,5 @@
         $field->print_after_form();
     }
 
-    print_footer($course);
+    echo $OUTPUT->footer();
 ?>
diff --git a/mod/data/export.php b/mod/data/export.php
index 19b11c85d70..915b2821adf 100644
--- a/mod/data/export.php
+++ b/mod/data/export.php
@@ -67,7 +67,7 @@ if($mform->is_cancelled()) {
     $currenttab = 'export';
     include('tabs.php');
     $mform->display();
-    print_footer();
+    echo $OUTPUT->footer();
     die;
 }
 
diff --git a/mod/data/field.php b/mod/data/field.php
index b02673394ce..cd20df17ff1 100755
--- a/mod/data/field.php
+++ b/mod/data/field.php
@@ -188,7 +188,7 @@
                                  'field.php?d='.$data->id.'&mode=delete&fid='.$fid.'&sesskey='.sesskey().'&confirm=1',
                                  'field.php?d='.$data->id);
 
-                    print_footer($course);
+                    echo $OUTPUT->footer();
                     exit;
                 }
             }
@@ -334,7 +334,7 @@
     }
 
 /// Finish the page
-    print_footer($course);
+    echo $OUTPUT->footer();
 
 
 ?>
diff --git a/mod/data/import.php b/mod/data/import.php
index b417f9a7ae5..311aa9c10ad 100755
--- a/mod/data/import.php
+++ b/mod/data/import.php
@@ -178,7 +178,7 @@
 
 
 /// Finish the page
-    print_footer($course);
+    echo $OUTPUT->footer();
 
 
 
diff --git a/mod/data/index.php b/mod/data/index.php
index 93e9c2a145d..399f79624bb 100755
--- a/mod/data/index.php
+++ b/mod/data/index.php
@@ -138,6 +138,6 @@
 
     echo "<br />";
     print_table($table);
-    print_footer($course);
+    echo $OUTPUT->footer();
 
 ?>
diff --git a/mod/data/preset.php b/mod/data/preset.php
index 3c35da69afe..15bba9c9ea1 100644
--- a/mod/data/preset.php
+++ b/mod/data/preset.php
@@ -100,7 +100,7 @@ switch ($action) {
         $optionsno = new object();
         $optionsno->d = $data->id;
         notice_yesno($strwarning, 'preset.php', 'preset.php', $options, $optionsno, 'post', 'get');
-        print_footer($course);
+        echo $OUTPUT->footer();
         exit(0);
         break;
 
@@ -135,7 +135,7 @@ switch ($action) {
         $pimporter = new PresetImporter($course, $cm, $data, $userid, $shortname);
         $pimporter->import_options();
 
-        print_footer($course);
+        echo $OUTPUT->footer();
         exit(0);
         break;
 
@@ -159,7 +159,7 @@ switch ($action) {
         $pimporter = new PresetImporter($course, $cm, $data, -$USER->id, $shortname);
         $pimporter->import_options();
 
-        print_footer($course);
+        echo $OUTPUT->footer();
         exit(0);
         break;
 
@@ -219,7 +219,7 @@ switch ($action) {
         echo '<input type="hidden" name="d" value="'.$data->id.'" />';
         echo '<input type="hidden" name="sesskey" value="'.$sesskey.'" />';
         echo '<input type="submit" value="'.$strcontinue.'" /></fieldset></form></div>';
-        print_footer($course);
+        echo $OUTPUT->footer();
         exit(0);
         break;
 
@@ -254,7 +254,7 @@ switch ($action) {
             echo '<input type="hidden" name="sesskey" value="'.$sesskey.'" />';
             echo '<input type="submit" value="'.$stroverwrite.'" /></div></form>';
             echo '</div>';
-            print_footer($course);
+            echo $OUTPUT->footer();
             exit(0);
             break;
         }
@@ -369,7 +369,7 @@ echo '</td></tr>';
 echo '</table>';
 echo '</div>';
 
-print_footer($course);
+echo $OUTPUT->footer();
 exit(0);
 
 ################################################################################
diff --git a/mod/data/report.php b/mod/data/report.php
index 6108be1bbd5..a255b9e93e4 100755
--- a/mod/data/report.php
+++ b/mod/data/report.php
@@ -77,5 +77,5 @@
     }
 
     echo $OUTPUT->close_window_button();
-    print_footer('none');
+    echo $OUTPUT->footer();
 ?>
diff --git a/mod/data/templates.php b/mod/data/templates.php
index df07eadbdae..4c2e0463007 100755
--- a/mod/data/templates.php
+++ b/mod/data/templates.php
@@ -288,5 +288,5 @@
     echo '</form>';
 
 /// Finish the page
-    print_footer($course);
+    echo $OUTPUT->footer();
 ?>
diff --git a/mod/data/view.php b/mod/data/view.php
index f7b019bb454..ebef06d34a2 100755
--- a/mod/data/view.php
+++ b/mod/data/view.php
@@ -345,7 +345,7 @@
                     $records[] = $deleterecord;
                     echo data_print_template('singletemplate', $records, $data, '', 0, true);
 
-                    print_footer($course);
+                    echo $OUTPUT->footer();
                     exit;
                 }
             }
@@ -668,5 +668,5 @@
     $completion=new completion_info($course);
     $completion->set_module_viewed($cm);
 
-    print_footer($course);
+    echo $OUTPUT->footer();
 ?>