Merge commit 'upstream/master'

1 files changed, 14 insertions, 12 deletions

diff --git a/system/libraries/Session.php b/system/libraries/Session.php
index 61a0d403..670ee6a6 100644
--- a/system/libraries/Session.php
+++ b/system/libraries/Session.php
@@ -2,7 +2,7 @@
 /**
  * Session library.
  *
- * $Id: Session.php 4073 2009-03-13 17:53:58Z Shadowhand $
+ * $Id: Session.php 4433 2009-07-01 03:44:20Z kiall $
  *
  * @package    Core
  * @author     Kohana Team
@@ -27,8 +27,8 @@ class Session_Core {
 	// Input library
 	protected $input;
 
-        // Automatically save the session by default
-        public static $should_save = true;
+	// Automatically save the session by default
+	public static $should_save = true;
 
 	/**
 	 * Singleton instance of Session.
@@ -458,14 +458,16 @@ class Session_Core {
 		}
 	}
 
-        /**
-         * Do not save this session.
-         *
-         * @return  void
-         */
-        public function abort_save() {
-                Session::$should_save = false;
-
-        }
+	/**
+	 * Do not save this session.
+	 * This is a performance feature only, if using the native
+	 * session "driver" the save will NOT be aborted.
+	 * 
+	 * @return  void
+	 */
+	public function abort_save()
+	{
+		Session::$should_save = FALSE;
+	}
 
 } // End Session Class