Changeset 1637

Timestamp:

12/28/2007 12:41:16 PM (11 months ago)

Author:

Shadowhand

Message:

Added Session::instance().

Files:

• trunk/system/libraries/Session.php (modified) (5 diffs)

trunk/system/libraries/Session.php

@@ -10 +10 @@
 class Session_Core {
 
-        // Number of instances of Session object
-        private static $instances = 0;
+        // Session singleton
+        private static $instance;
 
         // Protected key names (cannot be set by the user)
@@ -27 +27 @@
 
         /**
+         * Singleton instance of Session.
+         */
+        public static function instance()
+        {
+                // Create the instance if it does not exist
+                empty(self::$instance) and new Session;
+
+                return self::$instance;
+        }
+
+        /**
          * Constructor: __construct
          *  On first session instance creation, sets up the driver and creates session.
@@ -35 +46 @@
 
                 // This part only needs to be run once
-                if (self::$instances === 0)
+                if (self::$instance === NULL)
                 {
                         // Load config
@@ -78 +89 @@
                         // the session cookie can be written
                         Event::add('system.send_headers', 'session_write_close');
-                }
-
-                // New instance
-                self::$instances += 1;
+
+                        // Singleton instance
+                        self::$instance = $this;
+                }
 
                 Log::add('debug', 'Session Library initialized');
@@ -133 +144 @@
                 if ( ! isset($_SESSION['_kf_flash_']))
                 {
-                        $_SESSION['user_agent'] = $this->input->user_agent();
+                        $_SESSION['user_agent'] = Kohana::$user_agent;
                         $_SESSION['ip_address'] = $this->input->ip_address();
                         $_SESSION['_kf_flash_'] = array();