javascript: MDL-16695 print_footer('empty'); was not printing the necessary end of...

diff --git a/lib/weblib.php b/lib/weblib.php
index a47de9704cc51b884b649ebae5cabb71bf147e59..1d17043558d6e4496f407a5da7b480aa92f9d96c 100644 (file)
--- a/lib/weblib.php
+++ b/lib/weblib.php
@@ -2721,7 +2721,7 @@ function print_footer($course=NULL, $usercourse=NULL, $return=false) {
                 //1.8 theme compatibility
                 $output .= "\n</div>"; // content div
             }
-            $output .= "\n</div>\n</body>\n</html>"; // close page div started in header
+            $output .= '\n</div>\n' . $PAGE->requires->get_end_code() . '</body>\n</html>'; // close page div started in header
             if ($return) {
                 return $output;
             } else {
@@ -3157,6 +3157,8 @@ function theme_setup($theme = '', $params=NULL) {
 /// Load up the theme config
     $THEME = NULL;   // Just to be sure
     include($CFG->themedir .'/'. $theme .'/config.php');  // Main config for current theme
+    $THEME->name = $theme;
+    $THEME->dir = $CFG->themedir .'/'. $theme;
 
 /// Put together the parameters
     if (!$params) {