From: toyomoyo <toyomoyo>
Date: Thu, 15 Feb 2007 05:15:06 +0000 (+0000)
Subject: fix for MDL-8517 broken xhtml for redirects
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=09b62d3b9920b03cc5afc91b6ba9a6d8df81b64b;p=moodle.git

fix for MDL-8517 broken xhtml for redirects
---

diff --git a/admin/langimport.php b/admin/langimport.php
index 7ae5dd38bf..81b6cb3200 100755
--- a/admin/langimport.php
+++ b/admin/langimport.php
@@ -57,7 +57,7 @@
 
                         case INSTALLED:
                             @unlink($CFG->dataroot.'/cache/languages');
-                            redirect('langimport.php', get_string('langpackupdated','admin',$pack));
+                            redirect('langimport.php', get_string('langpackupdated','admin',$pack), -1, $adminroot);
                         break;
 
                         case UPTODATE:
diff --git a/lib/weblib.php b/lib/weblib.php
index d49405d0b0..9f288fb539 100644
--- a/lib/weblib.php
+++ b/lib/weblib.php
@@ -4809,7 +4809,7 @@ function notice_yesno ($message, $linkyes, $linkno, $optionsyes=NULL, $optionsno
  *      the correct input) and then encode for where it's needed
  *      echo "<script type='text/javascript'>alert('Redirect $url');</script>";
  */
-function redirect($url, $message='', $delay=-1) {
+function redirect($url, $message='', $delay=-1, $adminroot = '') {
 
     global $CFG;
 
@@ -4888,7 +4888,12 @@ function redirect($url, $message='', $delay=-1) {
 //]]>
 </script>
 <?php
-    print_footer('none');
+    // fix for MDL-8517, admin pages redirections causes bad xhtml
+    if ($adminroot) {
+        admin_externalpage_print_footer($adminroot);  
+    } else {
+        print_footer('none');
+    }
     die;
 }