github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2024-12-11 21:43:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #801 from Luceos/extension_fix

Browse Source 
Extension fix
This commit is contained in:
Daniël Klabbers 2016-02-14 22:18:08 +01:00
commit 6e0715e822
3 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
framework/core/src/Api/Controller/UninstallExtensionController.php
View File

@ -37,7 +37,9 @@ class UninstallExtensionController extends AbstractDeleteController
$name = array_get($request->getQueryParams(), 'name'); $name = array_get($request->getQueryParams(), 'name');
$this->extensions->disable($name); $extension = $this->extensions->getExtension($name);
$this->extensions->uninstall($name);
$this->extensions->disable($extension);
$this->extensions->uninstall($extension);
} }
} }

6
framework/core/src/Api/Controller/UpdateExtensionController.php
View File

@ -42,10 +42,12 @@ class UpdateExtensionController implements ControllerInterface
$enabled = array_get($request->getParsedBody(), 'enabled'); $enabled = array_get($request->getParsedBody(), 'enabled');
$name = array_get($request->getQueryParams(), 'name'); $name = array_get($request->getQueryParams(), 'name');
$extension = $this->extensions->getExtension($name);
if ($enabled === true) { if ($enabled === true) {
$this->extensions->enable($name); $this->extensions->enable($extension);
} elseif ($enabled === false) { } elseif ($enabled === false) {
$this->extensions->disable($name); $this->extensions->disable($extension);
} }
} }
} }

11
framework/core/src/Extension/Extension.php
View File

@ -86,9 +86,18 @@ class Extension implements Arrayable
*/ */
public function __construct($path, $composerJson) public function __construct($path, $composerJson)
{ {
$this->id = end(explode('/', $path));
$this->path = $path; $this->path = $path;
$this->composerJson = $composerJson; $this->composerJson = $composerJson;
$this->assignId();
}
/**
* Assigns the id for the extension used globally.
*/
protected function assignId()
{
$segments = explode('/', $this->path);
$this->id = end($segments);
} }
/** /**