mirror_php/winter
1
0
Fork 0
mirror of https://github.com/wintercms/winter.git synced 2024-06-28 05:33:29 +02:00
Code Issues Projects Releases Wiki Activity

Fixes an issue where using invalid CSS in brand settings completely breaks the backend

Browse Source
This commit is contained in:
Samuel Georges 2015-05-06 18:44:48 +10:00
parent 58ace7ee6c
commit 445c95ad46
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
modules/backend/models/BrandSettings.php
View File

@ -5,6 +5,7 @@ use Lang;
use Model;
use Cache;
use Less_Parser;
use Exception;
/**
* Backend settings that affect all users
@ -81,8 +82,14 @@ class BrandSettings extends Model
return Cache::get(self::CACHE_KEY);
}
$customCss = self::compileCss();
Cache::forever(self::CACHE_KEY, $customCss);
try {
$customCss = self::compileCss();
Cache::forever(self::CACHE_KEY, $customCss);
}
catch (Exception $ex) {
$customCss = '/* ' . $ex->getMessage() . ' */';
}
return $customCss;
}
@ -108,8 +115,8 @@ class BrandSettings extends Model
$parser->ModifyVars($vars);
$parser->parse(
File::get(base_path().'/modules/backend/models/brandsettings/custom.less')
. self::get('custom_css')
File::get(base_path().'/modules/backend/models/brandsettings/custom.less') .
self::get('custom_css')
);
$css = $parser->getCss();