Changeset 2030

Timestamp:

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

Author:

Geert

Message:

Merging r2028 and r2029 into releases/2.1.1

Location:

releases/2.1.1/system/libraries

Files:

• Pagination.php (modified) (1 diff)
• User_agent.php (modified) (2 diffs)

releases/2.1.1/system/libraries/Pagination.php

@@ -148 +148 @@
 
         /**
-         * Gets the SQL offset of the first row to return. Deprecated.
+         * So that users can use $pagination->total_pages() or $pagination->total_pages.
          *
-         * @return  integer  sql offset
+         * @param   string  function name
+         * @return  string
          */
-        public function sql_offset()
+        public function __call($func, $args = FALSE)
         {
-                return $this->sql_offset;
-        }
-
-        /**
-         * Generates the complete SQL LIMIT clause. Deprecated.
-         *
-         * @return  string  sql limit clause
-         */
-        public function sql_limit()
-        {
-                return $this->sql_limit;
+                return $this->__get($func);
         }
 

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();
                 }