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

Inject SettingsRepository where possible

Browse Source
This commit is contained in:
Franz Liedke
2015-07-16 00:32:50 +02:00
parent 31e9f44dfb
commit c2bf0b6b3a
3 changed files with 40 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/Support/ClientAction.php
View File

@@ -5,6 +5,7 @@ use Flarum\Assets\AssetManager;
use Flarum\Assets\JsCompiler;
use Flarum\Assets\LessCompiler;
use Flarum\Core;
use Flarum\Core\Settings\SettingsRepository;
use Flarum\Core\Users\User;
use Flarum\Locale\JsCompiler as LocaleJsCompiler;
use Flarum\Locale\LocaleManager;
@@ -61,14 +62,20 @@ abstract class ClientAction extends HtmlAction
*/
protected $locales;
/**
* @var SettingsRepository
*/
protected $settings;
/**
* @param Client $apiClient
* @param LocaleManager $locales
*/
public function __construct(Client $apiClient, LocaleManager $locales)
public function __construct(Client $apiClient, LocaleManager $locales, SettingsRepository $settings)
{
$this->apiClient = $apiClient;
$this->locales = $locales;
$this->settings = $settings;
}
/**
@@ -156,7 +163,7 @@ abstract class ClientAction extends HtmlAction
$assets->addLess("@$name: $value;");
}
$assets->addLess(Core::config('custom_less'));
$assets->addLess($this->settings->get('custom_less'));
}
/**
@@ -168,10 +175,10 @@ abstract class ClientAction extends HtmlAction
protected function getLessVariables()
{
return [
'fl-primary-color' => Core::config('theme_primary_color', '#000'),
'fl-secondary-color' => Core::config('theme_secondary_color', '#000'),
'fl-dark-mode' => Core::config('theme_dark_mode') ? 'true' : 'false',
'fl-colored-header' => Core::config('theme_colored_header') ? 'true' : 'false'
'fl-primary-color' => $this->settings->get('theme_primary_color', '#000'),
'fl-secondary-color' => $this->settings->get('theme_secondary_color', '#000'),
'fl-dark-mode' => $this->settings->get('theme_dark_mode') ? 'true' : 'false',
'fl-colored-header' => $this->settings->get('theme_colored_header') ? 'true' : 'false'
];
}