mirror of
https://github.com/danog/phpseclib.git
synced 2024-11-30 04:39:21 +01:00
Merge branch '1.0' into 2.0
This commit is contained in:
commit
836d452acd
@ -3836,10 +3836,10 @@ class X509
|
||||
function setStartDate($date)
|
||||
{
|
||||
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');
|
||||
}
|
||||
|
||||
/**
|
||||
@ -3864,10 +3864,10 @@ class X509
|
||||
$this->endDate = new Element($temp);
|
||||
} else {
|
||||
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');
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user