Changeset 3171 for trunk/system/libraries/Controller.php

Timestamp:

07/20/2008 09:27:11 PM (4 months ago)

Author:

Shadowhand

Message:

Optimizations to Input, URI, View, and Controller

Files:

• trunk/system/libraries/Controller.php (modified) (1 diff)

trunk/system/libraries/Controller.php

@@ -23 +23 @@
         public function __construct()
         {
-                if (Kohana::$instance === NULL)
+                if (Kohana::$instance == NULL)
                 {
                         // Set the instance to the first controller loaded
                         Kohana::$instance = $this;
+                }
 
-                        // URI should always be available
-                        $this->uri = new URI;
+                // URI should always be available
+                $this->uri = URI::instance();
 
-                        // Input should always be available
-                        $this->input = new Input;
-                }
-                else
-                {
-                        // URI should always be available
-                        $this->uri = Kohana::$instance->uri;
-
-                        // Input should always be available
-                        $this->input = Kohana::$instance->input;
-                }
+                // Input should always be available
+                $this->input = Input::instance();
         }