From 8e849206dd5f049c3b2867bb9f7d9c25aa0ba807 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@bah.spb.su>
Date: Thu, 1 Mar 2007 13:29:25 +0100
Subject: login system fixes (2)

---
 functions.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'functions.php')

diff --git a/functions.php b/functions.php
index 59086506a..70cc16cc9 100644
--- a/functions.php
+++ b/functions.php
@@ -1170,7 +1170,7 @@
 
 		if ($_SESSION["cookie_lifetime"] && $_SESSION["uid"]) {
 
-#			print time() . " vs " .  $_SESSION["cookie_lifetime"];
+			//print_r($_SESSION);
 
 			if (time() > $_SESSION["cookie_lifetime"]) {
 				return false;
@@ -1210,7 +1210,7 @@
 					if ($remember_me) {
 						$_SESSION["cookie_lifetime"] = time() + 
 							SESSION_COOKIE_LIFETIME_REMEMBER;
-					} else {
+					} else if (SESSION_COOKIE_LIFETIME > 0) {
 						$_SESSION["cookie_lifetime"] = time() + SESSION_COOKIE_LIFETIME;
 					}
 
-- 
cgit v1.2.3-54-g00ecf