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

Frontend extender: Work without extension, too

Browse Source
This commit is contained in:
Franz Liedke
2018-09-01 16:15:02 +02:00
parent a49f2204ab
commit e8c779fcf4
2 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
framework/core/src/Extend/Frontend.php
View File

@@ -53,11 +53,11 @@ class Frontend implements ExtenderInterface
public function __invoke(Container $container, Extension $extension = null)
{
$this->registerAssets($container, $extension);
$this->registerAssets($container, $this->getModuleName($extension));
$this->registerRoutes($container);
}
private function registerAssets(Container $container, Extension $extension)
private function registerAssets(Container $container, string $moduleName)
{
if (empty($this->css) && empty($this->js)) {
return;
@@ -65,10 +65,10 @@ class Frontend implements ExtenderInterface
$container->resolving(
"flarum.$this->frontend.assets",
function (CompilerFactory $assets) use ($extension) {
$assets->add(function () use ($extension) {
function (CompilerFactory $assets) use ($moduleName) {
$assets->add(function () use ($moduleName) {
return new ExtensionAssets(
$extension, $this->css, $this->js
$moduleName, $this->css, $this->js
);
});
}
@@ -91,4 +91,9 @@ class Frontend implements ExtenderInterface
);
}
}
private function getModuleName(?Extension $extension): string
{
return $extension ? $extension->getId() : 'site-custom';
}
}