Use setTimestamp instead of @timestamp in constructor

hugo8xx · Dec 11, 2015 · 0fac566 · 0fac566
1 parent 6cdf791
commit 0fac566
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/src/Date.php b/src/Date.php
@@ -26,13 +26,22 @@ class Date extends Carbon {
  */
  public function __construct($time = null, $timezone = null)
  {
- // Create Date from timestamp.
  if (is_int($time))
  {
- $time = "@$time";
+ $timestamp = $time;
+ $time = null;
+ }
+ else
+ {
+ $timestamp = null;
  }
 
  parent::__construct($time, $timezone);
+
+ if ($timestamp !== null)
+ {
+ $this->setTimestamp($timestamp);
+ }
  }
 
  /**