Header and footer should include $CFG->header and $CFG->footer, just in

case the chosen theme doesn't exist any more

diff --git a/lib/weblib.php b/lib/weblib.php
index 6185a63bd5477b5e010d2526f97c6874016e1f7a..284676903aab496442351a755545bcd21e5eaaa0 100644 (file)
--- a/lib/weblib.php
+++ b/lib/weblib.php
@@ -2214,7 +2214,7 @@ function print_header ($title='', $heading='', $navigation='', $focus='',
     $bodytags .= ' class="'.$pageclass.'" id="'.$pageid.'"';
 
     ob_start();
-    include ($CFG->themedir.current_theme().'/header.html');
+    include($CFG->header);
     $output = ob_get_contents();
     ob_end_clean();
 
@@ -2341,7 +2341,7 @@ function print_footer($course=NULL, $usercourse=NULL, $return=false) {
 /// Include the actual footer file
 
     ob_start();
-    include ($CFG->themedir.current_theme().'/footer.html');
+    include($CFG->footer);
     $output = ob_get_contents();
     ob_end_clean();