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

[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  2d3d9658c77fa16fd3945306a03965f738b80d7a (commit)
      from  d6d1e71b5d481d80ecb3de3f690a78f27c121cdd (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 2d3d9658c77fa16fd3945306a03965f738b80d7a
Author: Ivan1986 <iva...@li...>
Date:   Fri May 14 13:37:04 2010 +0400

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

diff --git a/QFW/QuickFW/Session.php b/QFW/QuickFW/Session.php
index fefb01d..255a40c 100644
--- a/QFW/QuickFW/Session.php
+++ b/QFW/QuickFW/Session.php
@@ -69,12 +69,15 @@ class QuickFW_Session
 	 */
 	public static function destroy($id)
 	{
+		if (!session_id())
+			return;
 		setcookie(session_name(), '', 1, '/',
 			isset(QFW::$config['session']['domain']) ? QFW::$config['session']['domain'] : '');
 		unset($_COOKIE[session_name()]);
-		self::$cache->remove('sess_'.$id);
+		if (self::$cache)
+			self::$cache->remove('sess_'.$id);
 		$_SESSION = array();
-		session_id('');
+		session_destroy();
 	}
 
 	/**

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

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


hooks/post-receive
-- 
quickfw