Changeset 2030 for releases/2.1.1/system/libraries/User_agent.php

Timestamp:

02/11/2008 10:16:19 AM (11 months ago)

Author:

Geert

Message:

Merging r2028 and r2029 into releases/2.1.1

Files:

• releases/2.1.1/system/libraries/User_agent.php (modified) (2 diffs)

releases/2.1.1/system/libraries/User_agent.php

@@ -60 +60 @@
                 if (empty(self::$languages) AND ! empty($_SERVER['HTTP_ACCEPT_LANGUAGE']))
                 {
-                        preg_match_all('/[-a-z]{2,}/i', trim($_SERVER['HTTP_ACCEPT_LANGUAGE']), self::$languages);
+                        self::$languages = (preg_match_all('/[-a-z]{2,}/', strtolower(trim($_SERVER['HTTP_ACCEPT_LANGUAGE'])), $matches)) ? $matches[0] : array();
                 }
 
@@ -66 +66 @@
                 if (empty(self::$charsets) AND ! empty($_SERVER['HTTP_ACCEPT_CHARSET']))
                 {
-                        preg_match_all('/[-a-z0-9]{2,}/i', trim($_SERVER['HTTP_ACCEPT_CHARSET']), self::$charsets);
+                        self::$charsets = (preg_match_all('/[-a-z0-9]{2,}/', strtolower(trim($_SERVER['HTTP_ACCEPT_CHARSET'])), $matches)) ? $matches[0] : array();
                 }