diff --git a/app/Mage.php b/app/Mage.php index 209e2cfc42a..3bdbc88e7a4 100644 --- a/app/Mage.php +++ b/app/Mage.php @@ -8,6 +8,7 @@ */ use Carbon\Carbon; +use Carbon\Exceptions\InvalidFormatException; use Monolog\Formatter\LineFormatter; use Monolog\Handler\StreamHandler; use Monolog\Level; @@ -862,8 +863,17 @@ public static function isInstalled($options = []) if (is_readable($localConfigFile)) { $localConfig = simplexml_load_file($localConfigFile); date_default_timezone_set('UTC'); - if (($date = $localConfig->global->install->date) && Carbon::parse((string) $date)->getTimestamp()) { + + $date = (string) $localConfig->global->install->date; + if ($date === '') { + return self::$_isInstalled; + } + + try { + Carbon::parse($date); self::$_isInstalled = true; + } catch (InvalidFormatException) { + self::$_isInstalled = false; } } }