Changeset 1754

Timestamp:

01/20/2008 05:14:16 PM (9 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()
  

Location:

trunk/system

Files:

• core/Kohana.php (modified) (3 diffs)
• libraries/Controller.php (modified) (2 diffs)
• libraries/Input.php (modified) (1 diff)
• libraries/URI.php (modified) (1 diff)

trunk/system/core/Kohana.php

@@ -13 +13 @@
 
         // The singleton instance of the controller
-        public static $instance = NULL;
+        public static $instance;
 
         // Output buffering level
@@ -177 +177 @@
         final public static function & instance()
         {
-                if (self::$instance == FALSE)
+                if (self::$instance === NULL)
                 {
                         Benchmark::start(SYSTEM_BENCHMARK.'_controller_setup');
@@ -228 +228 @@
                         }
 
-                        // Load the controller
-                        $controller = new $controller();
+                        // Initialize the controller
+                        $controller = new $controller;
 
                         // Run system.post_controller_constructor

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();
         }
 

trunk/system/libraries/Input.php

@@ -10 +10 @@
 class Input_Core {
 
+        // Singleton instance
         protected static $instance;
 

trunk/system/libraries/URI.php

@@ -11 +11 @@
 
         /**
-         * Constructor.
-         */
-        public function __construct()
-        {
-                Log::add('debug', 'URI library initialized.');
+         * Returns a singleton instance of URI.
+         *
+         * @return  object
+         */
+        public static function instance()
+        {
+                static $instance;
+
+                // Initialize the URI instance
+                empty($instance) and $instance = new URI;
+
+                return $instance;
         }