Regression: Fixed Grav update bug [#2722]

getgrav · Nov 8, 2019 · 77887d8 · 77887d8
1 parent 3514ff6
commit 77887d8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,8 @@
 
 1. [](#new)
     * Added new `-r <job-id>` 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
@@ -10,8 +10,6 @@
     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
@@ -186,7 +186,7 @@ public function prepare(): void
         // Override Grav\Installer classes by using this version of Grav.
         $loader->addClassMap($this->classMap);
 
-        $this->location = $location;
+        $this->location = dirname($location, 4);
     }
 
     /**