Remove forced setting of cache_lifetime to false in constructor and set default cache_lifetime to 3600

tom@aligent.com.au · nmalevanec · commit 53c732150e2b · 2018-02-22T11:22:17.000Z
diff --git a/app/code/Magento/Theme/Block/Html/Footer.php b/app/code/Magento/Theme/Block/Html/Footer.php
@@ -57,7 +57,6 @@ protected function _construct()
     {
         $this->addData(
             [
-                'cache_lifetime' => false,
                 'cache_tags' => [\Magento\Store\Model\Store::CACHE_TAG, \Magento\Cms\Model\Block::CACHE_TAG],
             ]
         );
@@ -123,4 +122,14 @@ public function getIdentities()
     {
         return [\Magento\Store\Model\Store::CACHE_TAG, \Magento\Cms\Model\Block::CACHE_TAG];
     }
+
+    /**
+     * Get block cache life time
+     *
+     * @return int
+     */
+    protected function getCacheLifetime()
+    {
+        return parent::getCacheLifetime() ?: 3600;
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,6 @@ protected function _construct()`
`57`	`57`	`{`
`58`	`58`	`$this->addData(`
`59`	`59`	`[`
`60`		`- 'cache_lifetime' => false,`
`61`	`60`	`'cache_tags' => [\Magento\Store\Model\Store::CACHE_TAG, \Magento\Cms\Model\Block::CACHE_TAG],`
`62`	`61`	`]`
`63`	`62`	`);`
`@@ -123,4 +122,14 @@ public function getIdentities()`
`123`	`122`	`{`
`124`	`123`	`return [\Magento\Store\Model\Store::CACHE_TAG, \Magento\Cms\Model\Block::CACHE_TAG];`
`125`	`124`	`}`
	`125`	`+`
	`126`	`+ /**`
	`127`	`+ * Get block cache life time`
	`128`	`+ *`
	`129`	`+ * @return int`
	`130`	`+ */`
	`131`	`+ protected function getCacheLifetime()`
	`132`	`+ {`
	`133`	`+ return parent::getCacheLifetime() ?: 3600;`
	`134`	`+ }`
`126`	`135`	`}`