Changeset 1753

Timestamp:

01/20/2008 04:47:09 PM (12 months ago)

Author:

PugFish

Message:

Removed the dependancy on Kohana in Controller

Location:

trunk/system

Files:

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

trunk/system/config/session.php

@@ -29 +29 @@
 /**
  * Number of seconds that each session will last.
+ * A value of 0 will keep the session active until the browser is closed.
  */
 $config['expiration'] = 7200;

trunk/system/core/Kohana.php

@@ -13 +13 @@
 
         // The singleton instance of the controller
-        private static $instance = NULL;
+        public static $instance = NULL;
 
         // Output buffering level
@@ -26 +26 @@
         // The current user agent
         public static $user_agent = '';
-
-        /**
-         * Allows the controller to be a true singleton object. This method *must*
-         * be called by all controllers.
-         *
-         * @throws  Kohana_Exception  if controller instance already exists
-         */
-        public function __construct()
-        {
-                if (is_object(self::$instance))
-                        throw new Kohana_Exception('core.there_can_be_only_one');
-
-                self::$instance = $this;
-        }
-
-        /**
-         * Protects the Kohana instance from being copied
-         */
-        final public function __clone()
-        {
-                $this->__construct();
-        }
 
         /**
@@ -252 +230 @@
                         // Load the controller
                         $controller = new $controller();
-
-                        // Make sure the controller extends the Kohana class
-                        is_subclass_of($controller, __CLASS__) or exit
-                        (
-                                'Kohana controllers must have the Kohana class as an ancestor. '."\n".
-                                'Please make sure Controller is defined with: Controller_Core extends Kohana.'
-                        );
 
                         // Run system.post_controller_constructor

trunk/system/libraries/Controller.php

@@ -8 +8 @@
  *  license   - <http://kohanaphp.com/license.html>
  */
-class Controller_Core extends Kohana {
+class Controller_Core {
 
         // Always loaded libraries
@@ -21 +21 @@
         public function __construct()
         {
-                // This must always be called, it provides the singleton functionality
-                parent::__construct();
+                if (Kohana::$instance == FALSE)
+                {
+                        Kohana::$instance = $this;
+                }
 
                 // Loader should always be available