Changeset 2138 for trunk/system/core/Kohana.php

Timestamp:

02/22/2008 12:21:12 PM (11 months ago)

Author:

Shadowhand

Message:

A few small cleanups and optimizations that I've been holding on to.

Files:

• trunk/system/core/Kohana.php (modified) (4 diffs)

trunk/system/core/Kohana.php

@@ -739 +739 @@
                         foreach(Config::include_paths() as $path)
                         {
+                                // Recursively get and merge all files
                                 $files = array_merge($files, self::list_files($directory, $recursive, $path.$directory));
                         }
@@ -779 +780 @@
                 static $language = array();
 
-                $group = current(explode('.', $key));
-
-                if ( ! isset($language[$group]))
+                // Extract the main group from the key
+                $group = explode('.', $key, 1);
+                $group = $group[0];
+
+                if (empty($language[$group]))
                 {
                         // Messages from this file
@@ -809 +812 @@
                 }
 
+                // Get the line from the language
                 $line = self::key_string($key, $language);
 
@@ -881 +885 @@
         /**
          * Retrieves current user agent information:
-         * keys:        browser, version, platform, mobile, robot, referrer, languages, charsets
-         * tests:       is_browser, is_mobile, is_robot, accept_
+         * keys:  browser, version, platform, mobile, robot, referrer, languages, charsets
+         * tests: is_browser, is_mobile, is_robot, accept_lang, accept_charset
          *
          * @param   string   key or test name