From 1d6c5d296e372c70ef53054e661957d856b34842 Mon Sep 17 00:00:00 2001
From: nanosimbiot <nanosimbiot@a8ac35ab-4ca4-ca47-4c2d-a49a94f06293>
Date: Tue, 30 Aug 2011 08:20:06 +0000
Subject: [PATCH] r269

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

diff --git a/upload/config.php b/upload/config.php
index d99eba2c5..28a7160ef 100644
--- a/upload/config.php
+++ b/upload/config.php
@@ -53,7 +53,7 @@ $bb_cfg = $tr_cfg = $page_cfg = array();
 
 // Increase number of revision after update
 $bb_cfg['tp_version'] = '2.1 Stable';
-$bb_cfg['tp_release_state'] = 'R267';
+$bb_cfg['tp_release_state'] = 'R269';
 $bb_cfg['tp_release_date'] = '30-08-2011';
 
 // Database
diff --git a/upload/includes/functions.php b/upload/includes/functions.php
index d97de283a..1bb6e8861 100644
--- a/upload/includes/functions.php
+++ b/upload/includes/functions.php
@@ -1583,11 +1583,11 @@ function bb_date ($gmepoch, $format = false, $tz = null)
 
 	if(is_numeric($tz))
 	{
-        if (!$userdata['session_logged_in'])
+        if (empty($userdata['session_logged_in']))
 		{
-			$tz = $userdata['user_timezone'];
+			$tz = $bb_cfg['board_timezone'];
 		}
-		else $tz = $bb_cfg['board_timezone'];
+		else $tz = $userdata['user_timezone'];
 
 		$time_format = " H:i";