Changeset 2143

Timestamp:

02/22/2008 01:23:19 PM (9 months ago)

Author:

Geert

Message:

Various small cleanups

Location:

trunk/system

Files:

• core/Kohana.php (modified) (3 diffs)
• libraries/Pagination.php (modified) (1 diff)
• libraries/Session.php (modified) (1 diff)
• libraries/Validation.php (modified) (1 diff)

trunk/system/core/Kohana.php

@@ -894 +894 @@
          * @return  boolean  all tests
          */
-        public static function user_agent($key, $compare = NULL)
+        public static function user_agent($key = 'agent', $compare = NULL)
         {
                 static $info;
@@ -911 +911 @@
                                         if (stripos(Kohana::$user_agent, $agent) !== FALSE)
                                         {
-                                                if ($type === 'browser' AND preg_match('|'.preg_quote($agent).'[^0-9.]*([0-9.]+)|i', Kohana::$user_agent, $match))
+                                                if ($type === 'browser' AND preg_match('|'.preg_quote($agent).'[^0-9.]*+([0-9.]+)|i', Kohana::$user_agent, $match))
                                                 {
                                                         // Set the browser version
@@ -991 +991 @@
 
                 // Return the key, if set
-                return isset($info[$key]) ? $info[$key] : NULL;
+                return (isset($info[$key])) ? $info[$key] : NULL;
         }
 

trunk/system/libraries/Pagination.php

@@ -96 +96 @@
                 $this->items_per_page     = (int) max(1, $this->items_per_page);
                 $this->total_pages        = (int) ceil($this->total_items / $this->items_per_page);
-                $this->current_page       = (int) min(max(1, Kohana::$instance->uri->segment($this->uri_segment)), max(1, $this->total_pages));
+                $this->current_page       = (int) min(max(1, URI::instance()->segment($this->uri_segment)), max(1, $this->total_pages));
                 $this->current_first_item = (int) min((($this->current_page - 1) * $this->items_per_page) + 1, $this->total_items);
                 $this->current_last_item  = (int) min($this->current_first_item + $this->items_per_page - 1, $this->total_items);

trunk/system/libraries/Session.php

@@ -55 +55 @@
                         self::$protect = array_combine(self::$protect, self::$protect);
 
-                        if (self::$config['driver'] != 'native')
+                        if (self::$config['driver'] !== 'native')
                         {
                                 // Set driver name

trunk/system/libraries/Validation.php

@@ -546 +546 @@
                 foreach ($fields as $depends_on)
                 {
-                        if (! isset($this[$depends_on]) OR $this[$depends_on] == NULL)
+                        if ( ! isset($this[$depends_on]) OR $this[$depends_on] == NULL)
                                 return FALSE;
                 }