Use Parameters model instead of raw DB

This commit is contained in:
Sam Georges 2014-07-19 16:07:32 +10:00
parent 04888b2b93
commit a43f4f6b51
2 changed files with 15 additions and 17 deletions

View File

@ -1,15 +1,15 @@
<?php namespace Cms\Classes;
use URL;
use File;
use Lang;
use Cache;
use Event;
use Config;
use URL;
use Cache;
use DB;
use DirectoryIterator;
use System\Classes\SystemException;
use October\Rain\Support\Yaml;
use System\Models\Parameters;
use System\Classes\SystemException;
use DirectoryIterator;
/**
* This class represents the CMS theme.
@ -94,14 +94,14 @@ class Theme
*/
public static function getActiveTheme()
{
$configKey = 'cms.activeTheme';
$paramKey = 'cms::theme.active';
$activeTheme = Config::get('cms.activeTheme');
$activeTheme = Config::get($configKey);
$dbResult = Parameters::findRecord($paramKey)
->remember(1440, $paramKey)
->pluck('value')
;
$dbResult = DB::table('system_settings')
->where('item', '=', $configKey)
->remember(1440, $configKey)
->pluck('value');
if ($dbResult !== null)
$activeTheme = $dbResult;
@ -127,11 +127,9 @@ class Theme
*/
public static function setActiveTheme($code)
{
$configKey = 'cms.activeTheme';
DB::table('system_settings')->where('item', '=', $configKey)->delete();
DB::table('system_settings')->insert(['item'=>$configKey, 'value'=>$code]);
Cache::forget($configKey);
$paramKey = 'cms::theme.active';
Parameters::set($paramKey, $code);
Cache::forget($paramKey);
}
/**

View File

@ -25,7 +25,7 @@
disabled
class="btn btn-disabled">
<i class="icon-star"></i>
<?= e(trans('cms::lang.theme.active_btn')) ?>
<?= e(trans('cms::lang.theme.active_button')) ?>
</button>
<?php else: ?>
<button