Merge branch '2.0'

This commit is contained in:
terrafrost 2017-09-30 22:56:43 +01:00
commit fabb42c20d

View File

@ -2790,10 +2790,10 @@ class X509
public function setStartDate($date) public function setStartDate($date)
{ {
if (!is_object($date) || !is_a($date, 'DateTime')) { if (!is_object($date) || !is_a($date, 'DateTime')) {
$date = new DateTime($date); $date = new DateTime($date, new DateTimeZone(@date_default_timezone_get()));
} }
$this->startDate = $date->format('D, d M Y H:i:s O', new DateTimeZone(@date_default_timezone_get())); $this->startDate = $date->format('D, d M Y H:i:s O');
} }
/** /**
@ -2817,10 +2817,10 @@ class X509
$this->endDate = new Element($temp); $this->endDate = new Element($temp);
} else { } else {
if (!is_object($date) || !is_a($date, 'DateTime')) { if (!is_object($date) || !is_a($date, 'DateTime')) {
$date = new DateTime($date); $date = new DateTime($date, new DateTimeZone(@date_default_timezone_get()));
} }
$this->endDate = $date->format('D, d M Y H:i:s O', new DateTimeZone(@date_default_timezone_get())); $this->endDate = $date->format('D, d M Y H:i:s O');
} }
} }