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

Timestamp:

01/20/2008 05:14:16 PM (12 months ago)

Author:

Shadowhand

Message:

Follow up to r1753:

• Removed URI::construct()
  
• Loader, URI, and Input will only be loaded for the first Controller
  
• Slight optimizations to Kohana::instance()
  

Files:

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

trunk/system/libraries/Controller.php

@@ -10 +10 @@
 class Controller_Core {
 
-        // Always loaded libraries
-        public $load;
-        public $uri;
-        public $input;
-
         /**
          * Constructor: __construct
@@ -21 +16 @@
         public function __construct()
         {
-                if (Kohana::$instance == FALSE)
+                if (empty(Kohana::$instance))
                 {
+                        // Set the instance to the first controller loaded
                         Kohana::$instance = $this;
+
+                        // Loader should always be available
+                        $this->load = new Loader;
+
+                        // URI should always be available
+                        $this->uri = new URI;
+
+                        // Input should always be available
+                        $this->input = new Input;
                 }
-
-                // Loader should always be available
-                $this->load = new Loader();
-
-                // URI should always be available
-                $this->uri = new URI();
-
-                // Input should always be available
-                $this->input = new Input();
         }