Fix #738
This commit is contained in:
parent
b7aa2bfb4a
commit
e8955c4f4d
|
@ -2,6 +2,7 @@
|
||||||
|
|
||||||
namespace Util;
|
namespace Util;
|
||||||
|
|
||||||
|
use Carbon\Carbon;
|
||||||
use Illuminate\Database\Capsule\Manager;
|
use Illuminate\Database\Capsule\Manager;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -118,14 +119,12 @@ class Generator
|
||||||
{
|
{
|
||||||
$replaces = self::$replaces;
|
$replaces = self::$replaces;
|
||||||
|
|
||||||
if ($date == null) {
|
$date_object = new Carbon($date);
|
||||||
$date = date('Y-m-d');
|
|
||||||
}
|
|
||||||
|
|
||||||
foreach ($replaces as $key => $value) {
|
foreach ($replaces as $key => $value) {
|
||||||
if (!isset($replaces[$key]['value'])) {
|
if (!isset($replaces[$key]['value'])) {
|
||||||
if (isset($replaces[$key]['date'])) {
|
if (isset($replaces[$key]['date'])) {
|
||||||
$replaces[$key]['value'] = date($replaces[$key]['date'], strtotime($date));
|
$replaces[$key]['value'] = $date_object->format($replaces[$key]['date']);
|
||||||
} else {
|
} else {
|
||||||
$replaces[$key]['value'] = $key;
|
$replaces[$key]['value'] = $key;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue