diff --git a/CHANGELOG.md b/CHANGELOG.md index 8dc1aec6..d0e30d02 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +# v1.2.14 +## 02/17/2017 + +1. [](#bugfix) + * Fixed bad bug with `GPM::install()` from a change in Admin v1.2.13 + # v1.2.13 ## 02/17/2017 diff --git a/classes/admincontroller.php b/classes/admincontroller.php index 636e759a..f034635f 100644 --- a/classes/admincontroller.php +++ b/classes/admincontroller.php @@ -5,7 +5,7 @@ use Grav\Common\Cache; use Grav\Common\Config\Config; use Grav\Common\File\CompiledYamlFile; use Grav\Common\Filesystem\Folder; -use Grav\Common\GPM\GPM; +use Grav\Common\GPM\GPM as GravGPM; use Grav\Common\GPM\Installer; use Grav\Common\Grav; use Grav\Common\Data; @@ -807,7 +807,7 @@ class AdminController extends AdminBaseController } try { - $gpm = new GPM($flush); + $gpm = new GravGPM($flush); $resources_updates = $gpm->getUpdatable(); if ($gpm->grav != null) {