Merged from 1.7

diff --git a/lib/ajax/ajaxlib.php b/lib/ajax/ajaxlib.php
index 1dbe42b8f04f6be901ec64eab452b8677547fc76..04bbf72b8e1bb9c42a5abe1035581688a14c4936 100644 (file)
--- a/lib/ajax/ajaxlib.php
+++ b/lib/ajax/ajaxlib.php
@@ -9,8 +9,10 @@ function require_js($list) {
     global $CFG;
     $output = '';
 
-    if (!check_browser_version('MSIE', 6.0) && !check_browser_version('Firefox', 1.5)) {
-        // We still have issues with YUI in other browsers.
+    if (!check_browser_version('MSIE', 6.0)
+                && !check_browser_version('Firefox', 1.5)
+                && !check_browser_version('Camino', 1.0.2)) {
+        // We still have issues with AJAX in other browsers.
         return;
     }
 
@@ -102,4 +104,5 @@ class jsportal {
     }
 
 }
-?>
+
+?>
\ No newline at end of file

diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index a612c0c09b97fdcc188858ec610f117a5422f427..e7ea1c36a8b2fadcb307a14249194a7d79de21c2 100644 (file)
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -5155,6 +5155,16 @@ function check_php_version($version='4.1.0') {
 
     switch ($brand) {
 
+      case 'Camino':   /// Mozilla Firefox browsers
+
+              if (preg_match("/Camino\/([0-9\.]+)/i", $agent, $match)) {
+                  if (version_compare($match[1], $version) >= 0) {
+                      return true;
+                  }
+              }
+              break;
+
+
       case 'Firefox':   /// Mozilla Firefox browsers
 
           if (preg_match("/Firefox\/([0-9\.]+)/i", $agent, $match)) {