MDL-7861, adding third param to notice() function, so that the right footer is printe...

diff --git a/admin/lang.php b/admin/lang.php
index adb5ca4e64d50f93bffc16f8424a1ede3d2a626e..aa503b34c566884f7d2fbf9b03fe151b71aa071c 100644 (file)
--- a/admin/lang.php
+++ b/admin/lang.php
@@ -257,7 +257,7 @@
         if (!empty($somethingfound)) {
             print_continue("lang.php");
         } else {
-            notice(get_string("languagegood"), "lang.php");
+            notice(get_string("languagegood"), "lang.php", '', $adminroot);
         }
 
     } else if ($mode == "compare") {

diff --git a/lib/weblib.php b/lib/weblib.php
index 086b39fb7e4c9705dc45564eecf9255210abae3e..23dc0b1dacad858cee13c1f6629862badc55a822 100644 (file)
--- a/lib/weblib.php
+++ b/lib/weblib.php
@@ -4676,7 +4676,7 @@ function editorshortcutshelpbutton() {
  * @param string $link ?
  * @todo Finish documenting this function
  */
-function notice ($message, $link='', $course=NULL) {
+function notice ($message, $link='', $course=NULL, $adminroot='') {
     global $CFG, $SITE;
 
     $message = clean_text($message);
@@ -4693,6 +4693,13 @@ function notice ($message, $link='', $course=NULL) {
     echo '<br />';
     print_simple_box($message, 'center', '50%', '', '20', 'generalbox', 'notice');
     print_continue($link);
+    
+    // xhtml strict fix, need to make sure it's the right footer
+    if ($adminroot) {
+        admin_externalpage_print_footer($adminroot);
+        exit;
+    }
+    
     if (empty($course)) {
         print_footer($SITE);
     } else {