mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-08-04 07:27:39 +02:00
Code Issues Releases Wiki Activity

Early returns

Browse Source
This commit is contained in:
Franz Liedke
2018-12-13 21:58:00 +01:00
parent b58380e224
commit 4b00f7996b
2 changed files with 50 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Extension/DefaultLanguagePackGuard.php
View File

@@ -42,12 +42,15 @@ class DefaultLanguagePackGuard
*/ */
public function whenExtensionWillBeDisabled(Disabling $event) public function whenExtensionWillBeDisabled(Disabling $event)
{ {
if (in_array('flarum-locale', $event->extension->extra)) { if (! in_array('flarum-locale', $event->extension->extra)) {
return;
}
$defaultLocale = $this->settings->get('default_locale'); $defaultLocale = $this->settings->get('default_locale');
$locale = array_get($event->extension->extra, 'flarum-locale.code'); $locale = array_get($event->extension->extra, 'flarum-locale.code');
if ($locale === $defaultLocale) { if ($locale === $defaultLocale) {
throw new ForbiddenException('You cannot disable the default language pack!'); throw new ForbiddenException('You cannot disable the default language pack!');
} }
} }
}
} }

12
src/Forum/ValidateCustomLess.php
View File

@@ -69,7 +69,10 @@ class ValidateCustomLess
*/ */
public function whenSettingsSaving(Saving $event) public function whenSettingsSaving(Saving $event)
{ {
if (isset($event->settings['custom_less'])) { if (! isset($event->settings['custom_less'])) {
return;
}
// We haven't saved the settings yet, but we want to trial a full // We haven't saved the settings yet, but we want to trial a full
// recompile of the CSS to see if this custom LESS will break // recompile of the CSS to see if this custom LESS will break
// anything. In order to do that, we will temporarily override the // anything. In order to do that, we will temporarily override the
@@ -102,19 +105,20 @@ class ValidateCustomLess
$this->assets->setAssetsDir($assetsDir); $this->assets->setAssetsDir($assetsDir);
$this->container->instance(SettingsRepositoryInterface::class, $settings); $this->container->instance(SettingsRepositoryInterface::class, $settings);
} }
}
/** /**
* @param Saved $event * @param Saved $event
*/ */
public function whenSettingsSaved(Saved $event) public function whenSettingsSaved(Saved $event)
{ {
if (isset($event->settings['custom_less'])) { if (! isset($event->settings['custom_less'])) {
return;
}
$this->assets->makeCss()->flush(); $this->assets->makeCss()->flush();
foreach ($this->locales->getLocales() as $locale => $name) { foreach ($this->locales->getLocales() as $locale => $name) {
$this->assets->makeLocaleCss($locale)->flush(); $this->assets->makeLocaleCss($locale)->flush();
} }
} }
}
} }