MDL-9647 simplify dealing with headers/footers in admin sections; some more cleanup

fixed continue button in error() on admin page when link present

diff --git a/files/index.php b/files/index.php
index 264fbdbf7420d0fa7ef89281e98ab29d46ff7b16..8f91ffc0ea14986727ec389d0d2a07cfa477502c 100644 (file)
--- a/files/index.php
+++ b/files/index.php
@@ -43,11 +43,7 @@
 
         echo '</td></tr></table>';
 
-        if ($course->id == SITEID) {
-                admin_externalpage_print_footer();
-        } else {
-            print_footer($course);
-        }
+        print_footer($course);
     }
 
     function html_header($course, $wdir, $formfield=""){

diff --git a/lib/weblib.php b/lib/weblib.php
index 60889fc5fe12a002939437311124fe30b6df95a7..da4924c891da772fbaaacfb1f506ff7c46f36ac0 100644 (file)
--- a/lib/weblib.php
+++ b/lib/weblib.php
@@ -4745,7 +4745,7 @@ function error ($message, $link='') {
         upgrade_log_finish();
     }
 
-    if (!$link) {
+    if (empty($link) and !defined('ADMIN_EXT_HEADER_PRINTED')) {
         if ( !empty($SESSION->fromurl) ) {
             $link = $SESSION->fromurl;
             unset($SESSION->fromurl);
@@ -4754,12 +4754,12 @@ function error ($message, $link='') {
         }
     }
 
-    if (defined('ADMIN_EXT_HEADER_PRINTED')) {
-        admin_externalpage_print_footer();
-    } else {
+    if (!empty($link)) {
         print_continue($link);
-        print_footer();
     }
+
+    print_footer();
+
     for ($i=0;$i<512;$i++) {  // Padding to help IE work with 404
         echo ' ';
     }
@@ -4992,12 +4992,6 @@ function notice ($message, $link='', $course=NULL) {
     print_box($message, 'generalbox', 'notice');
     print_continue($link);
 
-    // xhtml strict fix, need to make sure it's the right footer
-    if (defined('ADMIN_EXT_HEADER_PRINTED')) {
-        admin_externalpage_print_footer();
-        exit;
-    }
-
     if (empty($course)) {
         print_footer($SITE);
     } else {
@@ -5141,12 +5135,7 @@ function redirect($url, $message='', $delay=-1) {
 <?php
     }
 
-    // fix for MDL-8517, admin pages redirections causes bad xhtml
-    if (defined('ADMIN_EXT_HEADER_PRINTED')) {
-        admin_externalpage_print_footer();  
-    } else {
-        print_footer('none');
-    }
+    print_footer('none');
     die;
 }