Changeset 1976 for trunk/system/libraries/Router.php

Timestamp:

02/06/2008 06:33:55 PM (10 months ago)

Author:

Shadowhand

Message:

Tiny optimization to Router.

Files:

• trunk/system/libraries/Router.php (modified) (2 diffs)

trunk/system/libraries/Router.php

@@ -205 +205 @@
                         }
                 }
-                elseif (count($_GET) === 1 AND current($_GET) == '' AND substr($_SERVER['QUERY_STRING'], -1) !== '=')
+                elseif (count($_GET) === 1 AND current($_GET) === '' AND substr($_SERVER['QUERY_STRING'], -1) !== '=')
                 {
                         // The URI is the array key, eg: ?this/is/the/uri
@@ -239 +239 @@
                 {
                         // Remove the front controller from the current uri
-                        self::$current_uri = (string) substr(self::$current_uri, $strpos_fc + strlen($fc));
-                }
-
-                if ($suffix = Config::item('core.url_suffix') AND strpos(self::$current_uri, $suffix) !== FALSE)
-                {
-                        // Remove the URL suffix
-                        self::$current_uri = preg_replace('!'.preg_quote($suffix).'$!u', '', self::$current_uri);
-
-                        // Set the URL suffix
-                        self::$url_suffix = $suffix;
-                }
-
-                // Remove extra slashes from the segments that could cause fucked up routing
-                self::$current_uri = preg_replace('!//+!', '/', trim(self::$current_uri, '/'));
+                        self::$current_uri = substr(self::$current_uri, $strpos_fc + strlen($fc));
+                }
+
+                if (self::$current_uri !== '')
+                {
+                        if ($suffix = Config::item('core.url_suffix') AND strpos(self::$current_uri, $suffix) !== FALSE)
+                        {
+                                // Remove the URL suffix
+                                self::$current_uri = preg_replace('!'.preg_quote($suffix).'$!u', '', self::$current_uri);
+
+                                // Set the URL suffix
+                                self::$url_suffix = $suffix;
+                        }
+
+                        // Remove extra slashes from the segments that could cause fucked up routing
+                        self::$current_uri = preg_replace('!//+!', '/', trim(self::$current_uri, '/'));
+                }
         }