mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-07-26 03:01:22 +02:00
Code Issues Releases Wiki Activity

Boot new application instance before enabling extensions. fixes #1587 (#1631)

Browse Source
This commit is contained in:
Toby Zerner
2018-11-12 09:31:17 +10:30
committed by Franz Liedke
parent f346a51748
commit ac63665f8b
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
framework/core/src/Install/Console/InstallCommand.php
View File

@@ -16,6 +16,8 @@ use Flarum\Console\AbstractCommand;
use Flarum\Database\DatabaseMigrationRepository; use Flarum\Database\DatabaseMigrationRepository;
use Flarum\Database\Migrator; use Flarum\Database\Migrator;
use Flarum\Extension\ExtensionManager; use Flarum\Extension\ExtensionManager;
use Flarum\Foundation\Application as FlarumApplication;
use Flarum\Foundation\Site;
use Flarum\Group\Group; use Flarum\Group\Group;
use Flarum\Install\Prerequisite\PrerequisiteInterface; use Flarum\Install\Prerequisite\PrerequisiteInterface;
use Flarum\Settings\DatabaseSettingsRepository; use Flarum\Settings\DatabaseSettingsRepository;
@@ -186,9 +188,20 @@ class InstallCommand extends AbstractCommand
$this->createAdminUser(); $this->createAdminUser();
$this->enableBundledExtensions();
$this->publishAssets(); $this->publishAssets();
// Now that the installation of core is complete, boot up a new
// application instance before enabling extensions so that all of
// the application services are available.
Site::fromPaths([
'base' => $this->application->basePath(),
'public' => $this->application->publicPath(),
'storage' => $this->application->storagePath(),
])->bootApp();
$this->application = FlarumApplication::getInstance();
$this->enableBundledExtensions();
} catch (Exception $e) { } catch (Exception $e) {
@unlink($this->getConfigFile()); @unlink($this->getConfigFile());