Merge pull request #2140 from reg2005/patch-3

Critical bugFix in themeData.php
2016-07-07 07:54:53 +10:00 · 2016-07-07 07:54:53 +10:00 · dd86a13218
parent b4e9325a99 953b92ba0a
commit dd86a13218
1 changed files with 5 additions and 0 deletions
--- a/modules/cms/models/ThemeData.php
+++ b/modules/cms/models/ThemeData.php
@ -207,6 +207,11 @@ class ThemeData extends Model
    public static function applyAssetVariablesToCombinerFilters($filters)
    {
        $theme = CmsTheme::getActiveTheme();
+        
+        if(!$theme){
+            return;
+        }
+        
        if (!$theme->hasCustomData()) {
            return;
        }