diff --git a/CHANGELOG.md b/CHANGELOG.md index 438f81e3f..f6ec02caf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,8 @@ 1. [](#new) * Added new `-r ` option for Schduler CLI command to force-run a job [#2720](https://github.com/getgrav/grav/issues/2720) +1. [](#bugfix) + * Regression: Fixed Grav update bug [#2722](https://github.com/getgrav/grav/issues/2722) # v1.7.0-rc.1 ## 11/06/2019 diff --git a/system/install.php b/system/install.php index 07c00eccf..bd6f470a7 100644 --- a/system/install.php +++ b/system/install.php @@ -10,8 +10,6 @@ if (!defined('GRAV_ROOT')) { die(); } -use Grav\Installer\Install; - require_once __DIR__ . '/src/Grav/Installer/Install.php'; -return Install::instance(); +return Grav\Installer\Install::instance(); diff --git a/system/src/Grav/Installer/Install.php b/system/src/Grav/Installer/Install.php index dcc92356c..31ff02289 100644 --- a/system/src/Grav/Installer/Install.php +++ b/system/src/Grav/Installer/Install.php @@ -186,7 +186,7 @@ class Install // Override Grav\Installer classes by using this version of Grav. $loader->addClassMap($this->classMap); - $this->location = $location; + $this->location = dirname($location, 4); } /**