Merge branch 'master' of https://github.com/boonex/dolphin

inc/classes/BxDolTemplate.php

@@ -1088,7 +1088,7 @@ class BxDolTemplate extends BxDol implements iBxDolSingleton
         // recreate cache if it is empty
 
         if ($sCacheContent === null && ($sContent = file_get_contents($sAbsolutePath)) !== false && ($sContent = $this->_compileContent($sContent, "\$" . $sCacheVariableName, 1, $aVariables, $mixedKeyWrapperHtml)) !== false) {
-            if (false === $oCacheEngine->setData($sCacheKey, $sContent))
+            if (false === $oCacheEngine->setData($sCacheKey, trim($sContent)))
                 return false;
 
             if ($isFileBasedEngine)

template/scripts/BxBaseSearchResult.php

@@ -55,7 +55,7 @@ class BxBaseSearchResult extends BxDolSearchResult
                 $sCode .= $this->displaySearchUnit($aValue);
 
             $sSearchResultBlockId = 'bx-search-result-block-' . rand(0, PHP_INT_MAX);
-            $sCode = '<div id="' . $sSearchResultBlockId . '" class="bx-search-result-block bx-clearfix">' . $sCode . '</div>';
+            $sCode = '<div id="' . $sSearchResultBlockId . '" class="bx-search-result-block bx-def-margin-bottom bx-clearfix">' . $sCode . '</div>';
 
             if (!$this->_bLiveSearch && $this->sCenterContentUnitSelector) {
                 $sCode .= "