From 13a6bd535b7df893ceab7203485a87b39ebf8273 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Sevilla=20Mart=C3=ADn?= Date: Wed, 12 Dec 2018 18:16:03 -0500 Subject: [PATCH] Fix DELETE /api/extensions/* returning 500 (#1580) * Use extension string as parameter for ::disable & ::uninstall * Remove repeated 'ExtensionManager::disable' call * Fix StyleCI --- .../src/Api/Controller/UninstallExtensionController.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/framework/core/src/Api/Controller/UninstallExtensionController.php b/framework/core/src/Api/Controller/UninstallExtensionController.php index 454ea6109..b6e890681 100644 --- a/framework/core/src/Api/Controller/UninstallExtensionController.php +++ b/framework/core/src/Api/Controller/UninstallExtensionController.php @@ -38,9 +38,10 @@ class UninstallExtensionController extends AbstractDeleteController $name = array_get($request->getQueryParams(), 'name'); - $extension = $this->extensions->getExtension($name); + if ($this->extensions->getExtension($name) == null) { + return; + } - $this->extensions->disable($extension); - $this->extensions->uninstall($extension); + $this->extensions->uninstall($name); } }