Merge remote-tracking branch 'origin/MAGETWO-51905' into BUGS

Author: slavvka

app/code/Magento/Theme/Block/Html/Footer.php

@@ -19,6 +19,13 @@ class Footer extends \Magento\Framework\View\Element\Template implements \Magent
      */
     protected $_copyright;
 
+    /**
+     * Miscellaneous HTML information
+     *
+     * @var string
+     */
+    private $miscellaneousHtml;
+
     /**
      * @var \Magento\Framework\App\Http\Context
      */
@@ -85,6 +92,22 @@ public function getCopyright()
         return __($this->_copyright);
     }
 
+    /**
+     * Retrieve Miscellaneous HTML information
+     *
+     * @return string
+     */
+    public function getMiscellaneousHtml()
+    {
+        if ($this->miscellaneousHtml === null) {
+            $this->miscellaneousHtml = $this->_scopeConfig->getValue(
+                'design/footer/absolute_footer',
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+            );
+        }
+        return $this->miscellaneousHtml;
+    }
+
     /**
      * Return identifiers for produced content
      *

app/code/Magento/Theme/view/frontend/layout/default.xml

@@ -122,6 +122,9 @@
                 <block class="Magento\Framework\View\Element\Template" name="report.bugs" template="Magento_Theme::html/bugreport.phtml" />
             </container>
         </referenceContainer>
+        <referenceContainer name="before.body.end">
+            <block class="Magento\Theme\Block\Html\Footer" name="absolute_footer" template="html/absolute_footer.phtml" />
+        </referenceContainer>
         <referenceContainer name="content">
             <block class="Magento\Framework\View\Element\FormKey" name="formkey"/>
         </referenceContainer>

app/code/Magento/Theme/view/frontend/templates/html/absolute_footer.phtml

@@ -0,0 +1,7 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+?>
+<?php /* @escapeNotVerified */ echo $block->getMiscellaneousHtml();

lib/internal/Magento/Framework/View/Element/AbstractBlock.php

@@ -1044,7 +1044,7 @@ protected function _loadCache()
      */
     protected function _saveCache($data)
     {
-        if ($this->getCacheLifetime() === null || !$this->_cacheState->isEnabled(self::CACHE_GROUP)) {
+        if (!$this->getCacheLifetime() || !$this->_cacheState->isEnabled(self::CACHE_GROUP)) {
             return false;
         }
         $cacheKey = $this->getCacheKey();