ENGCOM-1979: Fix false cache_lifetime usage in xml layouts #16086

magento-engcom-team · magento-engcom-team · commit 4504c5b755f0 · 2018-06-13T04:57:15.000-05:00
- Merge Pull Request #16086 from Atwix/magento2:FixFalseCacheLifetimeUsage_2_2 - Merged commits: 1. 7fec991
diff --git a/lib/internal/Magento/Framework/View/Element/AbstractBlock.php b/lib/internal/Magento/Framework/View/Element/AbstractBlock.php
@@ -1074,7 +1074,7 @@ protected function getCacheLifetime()
 
         $cacheLifetime = $this->getData('cache_lifetime');
         if (false === $cacheLifetime || null === $cacheLifetime) {
-            return $cacheLifetime;
+            return null;
         }
 
         return (int)$cacheLifetime;

Original file line number	Diff line number	Diff line change
`@@ -1074,7 +1074,7 @@ protected function getCacheLifetime()`
`1074`	`1074`
`1075`	`1075`	`$cacheLifetime = $this->getData('cache_lifetime');`
`1076`	`1076`	`if (false === $cacheLifetime \|\| null === $cacheLifetime) {`
`1077`		`- return $cacheLifetime;`
	`1077`	`+ return null;`
`1078`	`1078`	`}`
`1079`	`1079`
`1080`	`1080`	`return (int)$cacheLifetime;`