From c4fb148fefd36bd255bc85e5c2058b875bf06041 Mon Sep 17 00:00:00 2001 From: nicolasconnault <nicolasconnault> Date: Thu, 6 Aug 2009 14:21:57 +0000 Subject: [PATCH] MDL-19797 Converted all print_footer() calls --- grade/edit/outcome/edit.php | 11 ++--------- grade/edit/outcome/import.php | 8 +------- grade/edit/outcome/index.php | 10 ++-------- grade/edit/scale/edit.php | 8 +------- grade/edit/scale/index.php | 9 +-------- 5 files changed, 7 insertions(+), 39 deletions(-) diff --git a/grade/edit/outcome/edit.php b/grade/edit/outcome/edit.php index 08b5240c6e0..d522183fd6c 100644 --- a/grade/edit/outcome/edit.php +++ b/grade/edit/outcome/edit.php @@ -125,16 +125,9 @@ if ($courseid) { if (!grade_scale::fetch_all_local($courseid) && !grade_scale::fetch_all_global()) { notice_yesno(get_string('noscales', 'grades'), $CFG->wwwroot.'/grade/edit/scale/edit.php?courseid='.$courseid, $returnurl); - print_footer($course); + echo $OUTPUT->footer(); die(); } $mform->display(); - -if ($courseid) { - print_footer($course); -} else { - admin_externalpage_print_footer(); -} - -?> +echo $OUTPUT->footer(); diff --git a/grade/edit/outcome/import.php b/grade/edit/outcome/import.php index 655cbb98b68..e760c2e8484 100644 --- a/grade/edit/outcome/import.php +++ b/grade/edit/outcome/import.php @@ -253,10 +253,4 @@ if ($handle = fopen($imported_file['userfile']['tmp_name'], 'r')) { // finish fclose($handle); -if ($courseid) { - print_footer($course); -} else { - admin_externalpage_print_footer(); -} - -?> +echo $OUTPUT->footer(); diff --git a/grade/edit/outcome/index.php b/grade/edit/outcome/index.php index 34b41147af5..bf1fbdfe199 100644 --- a/grade/edit/outcome/index.php +++ b/grade/edit/outcome/index.php @@ -104,7 +104,7 @@ switch ($action) { 'sesskey' => sesskey(), 'deleteconfirmed'=> 1) ); - print_footer(); + echo $OUTPUT->footer(); die; }else{ $outcome->delete(); @@ -254,10 +254,4 @@ echo '</div>'; $upload_form->display(); -if ($courseid) { - print_footer($course); -} else { - admin_externalpage_print_footer(); -} - -?> +echo $OUTPUT->footer(); diff --git a/grade/edit/scale/edit.php b/grade/edit/scale/edit.php index 384b0393f30..7014e3227fe 100644 --- a/grade/edit/scale/edit.php +++ b/grade/edit/scale/edit.php @@ -124,10 +124,4 @@ if ($courseid) { $mform->display(); -if ($courseid) { - print_footer($course); -} else { - admin_externalpage_print_footer(); -} - -?> +echo $OUTPUT->footer(); diff --git a/grade/edit/scale/index.php b/grade/edit/scale/index.php index fb5c0fe8429..ca96c4bb018 100644 --- a/grade/edit/scale/index.php +++ b/grade/edit/scale/index.php @@ -152,11 +152,4 @@ echo '<div class="buttons">'; print_single_button('edit.php', array('courseid'=>$courseid), $srtcreatenewscale); echo '</div>'; -if ($courseid) { - print_footer($course); -} else { - admin_externalpage_print_footer(); -} - - -?> +echo $OUTPUT->footer();