1
0
mirror of https://github.com/flarum/core.git synced 2025-10-12 23:44:27 +02:00

merges 5.5 and master into next-back

This commit is contained in:
Daniël Klabbers
2017-12-14 01:00:16 +01:00
104 changed files with 1723 additions and 1828 deletions

View File

@@ -15,6 +15,10 @@ use Flarum\Admin\Middleware\RequireAdministrateAbility;
use Flarum\Event\ConfigureMiddleware;
use Flarum\Extension\Event\Disabled;
use Flarum\Extension\Event\Enabled;
use Flarum\Core\Listener\CheckCustomLessFormat;
use Flarum\Event\ExtensionWasDisabled;
use Flarum\Event\ExtensionWasEnabled;
use Flarum\Event\SettingWasSet;
use Flarum\Foundation\AbstractServiceProvider;
use Flarum\Http\Middleware\AuthenticateWithSession;
use Flarum\Http\Middleware\DispatchRoute;
@@ -80,6 +84,8 @@ class AdminServiceProvider extends AbstractServiceProvider
$this->flushWebAppAssetsWhenThemeChanged();
$this->flushWebAppAssetsWhenExtensionsChanged();
$this->checkCustomLessFormat();
}
/**
@@ -124,4 +130,11 @@ class AdminServiceProvider extends AbstractServiceProvider
{
return $this->app->make(Frontend::class)->getAssets();
}
protected function checkCustomLessFormat()
{
$events = $this->app->make('events');
$events->subscribe(CheckCustomLessFormat::class);
}
}