diff options
author | vincent-peugnet <v.peugnet@free.fr> | 2020-04-25 17:53:44 +0200 |
---|---|---|
committer | vincent-peugnet <v.peugnet@free.fr> | 2020-04-25 17:53:44 +0200 |
commit | 0efeef6b6693d62675ec8a45e73c71f69e0a0362 (patch) | |
tree | 4b86b3bd62217fc4c60e2827e30a45209ce82605 /app/class/Event.php | |
parent | bd16dc7c6fc630a6b59ca3b041dde146ab50c72b (diff) | |
parent | 385b3f4adf86606e03941171c136d8f2eb2b35c2 (diff) | |
download | wcms-0efeef6b6693d62675ec8a45e73c71f69e0a0362.tar.gz wcms-0efeef6b6693d62675ec8a45e73c71f69e0a0362.zip |
Merge branch master with implement-exception
Diffstat (limited to 'app/class/Event.php')
-rw-r--r-- | app/class/Event.php | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/app/class/Event.php b/app/class/Event.php index 3317a1b..069050a 100644 --- a/app/class/Event.php +++ b/app/class/Event.php @@ -40,7 +40,7 @@ class Event extends Dbitem public function stamp() { - $this->date = new DateTimeImmutable(null, timezone_open("Europe/Paris")); + $this->date = new DateTimeImmutable("now", timezone_open("Europe/Paris")); $this->user = idclean($this->user); if (in_array($this->type, self::EVENT_ART)) { $this->target = idclean($this->target); @@ -66,16 +66,13 @@ class Event extends Dbitem switch ($type) { case 'datetime': return $this->date; - break; case 'string': return $this->date->format(DateTime::ISO8601); - break; case 'hrdi': - $now = new DateTimeImmutable(null, timezone_open("Europe/Paris")); + $now = new DateTimeImmutable("now", timezone_open("Europe/Paris")); return hrdi($this->date->diff($now)); - break; } } |