Changeset 1902

Timestamp:

02/02/2008 06:15:49 PM (11 months ago)

Author:

Shadowhand

Message:

Reworking how sessions are closed to be more flexible.

Files:

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

trunk/system/libraries/Session.php

@@ -81 +81 @@
 
                         // Close the session just before sending the headers, so that
-                        // the session cookie can be written
-                        Event::add('system.send_headers', 'session_write_close');
+                        // the session cookie(s) can be written.
+                        Event::add('system.send_headers', array($this, 'write_close'));
 
                         // Singleton instance
@@ -276 +276 @@
 
         /**
+         * Runs the system.session_write event, then calls session_write_close.
+         *
+         * @return void
+         */
+        public function write_close()
+        {
+                static $run;
+
+                if ($run === NULL)
+                {
+                        $run = TRUE;
+
+                        // Run the events that depend on the session being open
+                        Event::run('system.session_write');
+
+                        // Close the session
+                        session_write_close();
+                }
+        }
+
+        /**
          * Method: set
          *  Set a session variable.