Fix regression with block caching if cache is not available. #88

Author: nadar

CHANGELOG.md

@@ -2,6 +2,12 @@
 
 All notable changes to this project will be documented in this file. This project make usage of the [Yii Versioning Strategy](https://github.com/yiisoft/yii2/blob/master/docs/internals/versions.md). In order to read more about upgrading and BC breaks have a look at the [UPGRADE Document](UPGRADE.md).
 
+## 1.0.5.1 (in progress)
+
+### Fixed
+
++ [#88](https://github.com/luyadev/luya-module-cms/issues/88) Fix regression with block caching if cache is not available.
+
 ## 1.0.5 (5. June 2018)
 
 ### Fixed

src/base/PhpBlock.php

@@ -75,7 +75,7 @@ public function renderAdmin()
      */
     public function onRegister()
     {
-        if ($this->getIsCacheEnabled()) {
+        if ($this->getIsCacheEnabled() && $this->isCachingEnabled()) {
             $phpBlockView = $this->getView();
 
             $blockId = $this->getEnvOption('id');
@@ -100,14 +100,27 @@ public function onRegister()
      */
     public function onRegisterFromCache()
     {
-        $blockId = $this->getEnvOption('id');
-    
-        $cacheKeyAssets = ['blockassets', $blockId];
-        $cacheKeyAssetBundles = ['blockassetbundles', $blockId];
+        if ($this->isCachingEnabled()) {
+            $blockId = $this->getEnvOption('id');
+        
+            $cacheKeyAssets = ['blockassets', $blockId];
+            $cacheKeyAssetBundles = ['blockassetbundles', $blockId];
+        
+            $assets = Yii::$app->cache->get($cacheKeyAssets) ?: [];
+            $assetBundles = Yii::$app->cache->get($cacheKeyAssetBundles) ?: [];
+        
+            PhpBlockView::registerToAppView($assets, $assetBundles);
+        }
+    }
 
-        $assets = Yii::$app->cache->get($cacheKeyAssets) ?: [];
-        $assetBundles = Yii::$app->cache->get($cacheKeyAssetBundles) ?: [];
 
-        PhpBlockView::registerToAppView($assets, $assetBundles);
+    /**
+     * Will be replaced with cachable trait in future.
+     * 
+     * @return boolean
+     */
+    private function isCachingEnabled()
+    {
+        return Yii::$app->has('cache');
     }
 }