From: tjhunt <tjhunt>
Date: Wed, 26 Sep 2007 17:48:27 +0000 (+0000)
Subject: Comment out an if (ajaxenabled()) check that was stopping any javascript included... 
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=c6f9234ce38fc6e9d42d88381c902e1c32282cf7;p=moodle.git

Comment out an if (ajaxenabled()) check that was stopping any javascript included with require_js before print_header from being included, (but not js included afterwareds). See
http://moodle.org/mod/forum/discuss.php?d=81050 for discussion.
---

diff --git a/lib/weblib.php b/lib/weblib.php
index 13277782a2..657fa51144 100644
--- a/lib/weblib.php
+++ b/lib/weblib.php
@@ -2325,9 +2325,9 @@ function print_header ($title='', $heading='', $navigation='', $focus='',
 
 
 /// Add the required JavaScript Libraries for AJAX
-    if (!empty($CFG->enableajax)) {
+//    if (!empty($CFG->enableajax)) {  // This is the way all JS should be included, so get rid of the test.
         $meta .= "\n".require_js();
-    }
+//    }
 
 /// Set up some navigation variables
 
@@ -2385,7 +2385,8 @@ function print_header ($title='', $heading='', $navigation='', $focus='',
     }
 
 
-    $meta = '<meta http-equiv="content-type" content="text/html; charset=utf-8" />'. "\n". $meta ."\n";
+    $meta = '<meta http-equiv="content-type" content="text/html; charset=utf-8" />' .
+            "\n" . $meta . "\n";
     if (!$usexml) {
         @header('Content-type: text/html; charset=utf-8');
     }