Index: trunk/kernel/include/parseditem.php
===================================================================
diff -u -r3576 -r3736
--- trunk/kernel/include/parseditem.php	(.../parseditem.php)	(revision 3576)
+++ trunk/kernel/include/parseditem.php	(.../parseditem.php)	(revision 3736)
@@ -41,26 +41,22 @@
 */
 	function ParseTimeStamp($d,$attribs=array())
 	{
-       if( isset($attribs["_tz"]) )
-       {
-            $d = GetLocalTime($d,$objSession->Get("tz"));
-       }
-       $part = isset($attribs["_part"]) ? strtolower($attribs["_part"]) : '';
-       if(strlen($part))
-       {
-          $ret = ExtractDatePart($part,$d);
-       }
-       else
-       {
-         if($d<=0)
-         {
-            $ret = "";
-         }
-         else
-            $ret = LangDate($d);
-       }		
-       return $ret;
-	}		
+		global $objSession;
+		
+		if (isset($attribs['_tz'])) {
+			$timezone = $attribs['_tz'] == 'auto' ? null : $objSession->Get('tz');
+			$d = GetLocalTime($d, $timezone);
+		}
+		
+		$part = isset($attribs['_part']) ? strtolower($attribs['_part']) : '';
+		if ($part) {
+			$ret = ExtractDatePart($part,$d);
+		}
+		else {
+			$ret = $d <= 0 ? '' : LangDate($d);
+		}
+		return $ret;
+	}
 	
 	function ParseObject($element)
     {