From 357a63b77af81d340f172078db3b89b05700134c Mon Sep 17 00:00:00 2001
From: nanosimbiot <nanosimbiot@a8ac35ab-4ca4-ca47-4c2d-a49a94f06293>
Date: Tue, 30 Aug 2011 07:44:24 +0000
Subject: [PATCH] r268

 git-svn-id: https://torrentpier2.googlecode.com/svn/trunk@268 a8ac35ab-4ca4-ca47-4c2d-a49a94f06293
---
 upload/includes/functions.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/upload/includes/functions.php b/upload/includes/functions.php
index 6efc269db..d97de283a 100644
--- a/upload/includes/functions.php
+++ b/upload/includes/functions.php
@@ -1564,9 +1564,9 @@ function bb_date ($gmepoch, $format = false, $tz = null)
 
 	if (is_null($tz))
 	{
-		if (!$userdata['session_logged_in'])
-		{
			$tz = $userdata['user_timezone'];
		}
-		else $tz = $bb_cfg['board_timezone'];
+		if (empty($userdata['session_logged_in']))
+		{
			$tz = $bb_cfg['board_timezone'];
		}
+		else $tz = $userdata['user_timezone'];
 	}
 	if (!$format)
 	{