mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-08-01 14:10:37 +02:00
Code Issues Releases Wiki Activity

Some things should not be run when Flarum is not installed yet

Browse Source
This commit is contained in:
Franz Liedke
2015-07-02 23:14:25 +02:00
parent 5b7dafa0af
commit db062e373b
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
framework/core/src/Core.php
View File

@@ -9,7 +9,7 @@ class Core
public static function inDebugMode()
{
return app('flarum.config')['debug'];
return static::isInstalled() && app('flarum.config')['debug'];
}
public static function config($key, $default = null)

13
framework/core/src/Core/CoreServiceProvider.php
View File

@@ -1,5 +1,6 @@
<?php namespace Flarum\Core;
use Flarum\Core;
use Illuminate\Bus\Dispatcher as Bus;
use Illuminate\Contracts\Container\Container;
use Flarum\Support\ServiceProvider;
@@ -23,11 +24,13 @@ class CoreServiceProvider extends ServiceProvider
{
$this->loadViewsFrom(__DIR__.'/../../views', 'flarum');
$this->addEventHandlers();
$this->bootModels();
$this->addPostTypes();
$this->grantPermissions();
$this->mapCommandHandlers();
if (Core::isInstalled()) {
$this->addEventHandlers();
$this->bootModels();
$this->addPostTypes();
$this->grantPermissions();
$this->mapCommandHandlers();
}
}
public function mapCommandHandlers()