]> git.mjollnir.org Git - moodle.git/commitdiff
Fix for MDL-6685 (and MDL-7122 "breadcrumb separator missing"). Merged from MOODLE_17...
authornfreear <nfreear>
Tue, 28 Nov 2006 15:26:40 +0000 (15:26 +0000)
committernfreear <nfreear>
Tue, 28 Nov 2006 15:26:40 +0000 (15:26 +0000)
lib/weblib.php

index 58803bd257b1d7ca438be7794faf5111c88ccd2f..6db6b1ef866b48fc956395fa21c0c4fa28c3e0c3 100644 (file)
@@ -2668,12 +2668,29 @@ function check_theme_arrows() {
     global $THEME;
     
     if (!isset($THEME->rarrow) and !isset($THEME->larrow)) {
+        // Default, looks good in Win XP/IE 6, Win/Firefox 1.5, Win/Netscape 8...
+        // Also OK in Win 9x/2K/IE 5.x
         $THEME->rarrow = '&#x25BA;';
         $THEME->larrow = '&#x25C4;';
-        if (FALSE !== strpos($_SERVER['HTTP_USER_AGENT'], 'Opera')) {
+        $uagent = $_SERVER['HTTP_USER_AGENT'];
+        if (false !== strpos($uagent, 'Opera')
+            || false !== strpos($uagent, 'Mac')) {
+            // Looks good in Win XP/Mac/Opera 8/9, Mac/Firefox 2, Camino, Safari.
+            // Not broken in Mac/IE 5, Mac/Netscape 7 (?).
             $THEME->rarrow = '&#x25B6;';
             $THEME->larrow = '&#x25C0;';
-       }
+        }
+        elseif (false !== strpos($uagent, 'Konqueror')) {
+            $THEME->rarrow = '&rarr;';
+            $THEME->larrow = '&larr;';
+        }
+        elseif (isset($_SERVER['HTTP_ACCEPT_CHARSET'])
+            && false === stripos($_SERVER['HTTP_ACCEPT_CHARSET'], 'utf-8')) {
+            // (Win/IE 5 doesn't set ACCEPT_CHARSET, but handles Unicode.)
+            // To be safe, non-Unicode browsers!
+            $THEME->rarrow = '&gt;';
+            $THEME->larrow = '&lt;';
+        }
     }
 }