From 7fec991458e8ec6b7fa9530e8af3d30d52ec7bd6 Mon Sep 17 00:00:00 2001
From: Yuriy Tkachenko <y.tkachenko@atwix.com>
Date: Wed, 13 Jun 2018 11:00:59 +0300
Subject: [PATCH] Fix false cache_lifetime usage in xml layouts

---
 lib/internal/Magento/Framework/View/Element/AbstractBlock.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/internal/Magento/Framework/View/Element/AbstractBlock.php b/lib/internal/Magento/Framework/View/Element/AbstractBlock.php
index 0ffa9dce7f730..b2f857bf29f45 100644
--- 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;