[Quickfw-git] SF.net Git: quickfw branch, master, updated. afd9295222fefd7d41673eca494b2998794aa54d

[Ivan1986 <iva...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "quickfw".

The branch, master has been updated
       via  afd9295222fefd7d41673eca494b2998794aa54d (commit)
      from  3cb2a6436df81212e9297fd170df4ce77807a3e1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit afd9295222fefd7d41673eca494b2998794aa54d
Author: Ivan1986 <iva...@li...>
Date:   Fri Jun 11 17:54:07 2010 +0400

    Исправлена ошибка в сессиях

diff --git a/QFW/QuickFW/Session.php b/QFW/QuickFW/Session.php
index 255a40c..4ce813a 100644
--- a/QFW/QuickFW/Session.php
+++ b/QFW/QuickFW/Session.php
@@ -63,21 +63,29 @@ class QuickFW_Session
 	}
 
 	/**
+	 * Уничтожение сессии
+	 */
+	public static function destroy()
+	{
+		if (!session_id())
+			return;
+		self::dest(session_id());
+		session_destroy();
+	}
+
+	/**
 	 * Уничтожение сесии для session_set_save_handler
 	 *
 	 * @param string $id идентификатор сесии
 	 */
-	public static function destroy($id)
+	private static function dest($id)
 	{
-		if (!session_id())
-			return;
 		setcookie(session_name(), '', 1, '/',
 			isset(QFW::$config['session']['domain']) ? QFW::$config['session']['domain'] : '');
 		unset($_COOKIE[session_name()]);
 		if (self::$cache)
 			self::$cache->remove('sess_'.$id);
 		$_SESSION = array();
-		session_destroy();
 	}
 
 	/**
@@ -157,7 +165,7 @@ class QuickFW_Session
 				array('QuickFW_Session','close'),
 				array('QuickFW_Session','read'),
 				array('QuickFW_Session','write'),
-				array('QuickFW_Session','destroy'),
+				array('QuickFW_Session','dest'),
 				array('QuickFW_Session','gc')
 			);
 		}

-----------------------------------------------------------------------

Summary of changes:
 QFW/QuickFW/Session.php |   18 +++++++++++++-----
 1 files changed, 13 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
quickfw