Changeset 2569

Timestamp:

04/24/2008 10:38:16 PM (6 months ago)

Author:

Shadowhand

Message:

Slightly more logical organization of code.

Files:

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

trunk/system/libraries/Router.php

@@ -34 +34 @@
         public static function setup()
         {
+                if ( ! empty($_SERVER['QUERY_STRING']))
+                {
+                        // Set the query string to the current query string
+                        self::$query_string = '?'.trim($_SERVER['QUERY_STRING'], '&');
+                }
+
+                // Load routing configuration
                 self::$routes = Config::item('routes');
-
-                // Make sure the default route is set
-                if ( ! isset(self::$routes['_default']))
-                        throw new Kohana_Exception('core.no_default_route');
 
                 // Default route status
@@ -45 +48 @@
                 if (self::$current_uri === '')
                 {
+                        // Make sure the default route is set
+                        if ( ! isset(self::$routes['_default']))
+                                throw new Kohana_Exception('core.no_default_route');
+
                         // Use the default route when no segments exist
                         self::$current_uri = self::$routes['_default'];
@@ -54 +61 @@
                 // Make sure the URL is not tainted with HTML characters
                 self::$current_uri = html::specialchars(self::$current_uri, FALSE);
-
-                if ( ! empty($_SERVER['QUERY_STRING']))
-                {
-                        // Set the query string to the current query string
-                        self::$query_string = '?'.trim($_SERVER['QUERY_STRING'], '&');
-                }
 
                 // At this point segments, rsegments, and current URI are all the same