Merged from 1.7

diff --git a/lib/ajax/ajaxlib.php b/lib/ajax/ajaxlib.php
index 39d16183a9c44d8ce61c216e6a9471a12d29da50..d5701ad0c247fc6958927ecd332674427a06953d 100644 (file)
--- a/lib/ajax/ajaxlib.php
+++ b/lib/ajax/ajaxlib.php
@@ -9,6 +9,9 @@ function require_js($list) {
     global $CFG;
     $output = '';
 
+    return;     // Okay AJAX is nowhere near ready. Disabling until the major
+                // issues are resolved.
+
     if (!check_browser_version('MSIE', 6.0) && !check_browser_version('Firefox', 1.5)) {
         // We still have issues with YUI in other browsers.
         return;