Merge pull request #6926 from bembelimen/patch-5

Prevent notice with unset timezone while formatting a date
joomla · Oct 27, 2015 · 4672162 · 4672162
2 parents 88ab251 + bc71688
commit 4672162
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/libraries/joomla/date/date.php b/libraries/joomla/date/date.php
@@ -287,7 +287,7 @@ public function format($format, $local = false, $translate = true)
 		}
 
 		// If the returned time should not be local use GMT.
-		if ($local == false)
+		if ($local == false && !empty(self::$gmt))
 		{
 			parent::setTimezone(self::$gmt);
 		}
@@ -319,7 +319,7 @@ public function format($format, $local = false, $translate = true)
 			}
 		}
 
-		if ($local == false)
+		if ($local == false && !empty($this->tz))
 		{
 			parent::setTimezone($this->tz);
 		}