diff --git a/include/utils/utils.php b/include/utils/utils.php index b30dd3a3ab5e5f5c1718cb55fbfbdb042c1bfe80..d16865076c28655d32c41e6d05358c3fd81a9ddf 100755 --- a/include/utils/utils.php +++ b/include/utils/utils.php @@ -345,9 +345,14 @@ $toHtml = array( */ function to_html($string, $encode=true) { + $startstring=$string; + $cachedresult=Vtiger_Cache::get('to_html',$startstring); + if($cachedresult){ + return $cachedresult; + } + global $log,$default_charset; //$log->debug("Entering to_html(".$string.",".$encode.") method ..."); - global $toHtml; $action = $_REQUEST['action']; $search = $_REQUEST['search']; @@ -385,6 +390,7 @@ function to_html($string, $encode=true) } //$log->debug("Exiting to_html method ..."); + Vtiger_Cache::set('to_html', $startstring, $string); return $string; } diff --git a/layouts/vlayout/modules/Install/Step6.tpl b/layouts/vlayout/modules/Install/Step6.tpl index 9060fe6b195b27d62f365e501183aa18a1550f5c..1779dff126f71010ac2a2231f186091e3145cae7 100644 --- a/layouts/vlayout/modules/Install/Step6.tpl +++ b/layouts/vlayout/modules/Install/Step6.tpl @@ -109,7 +109,7 @@ <div id="progressIndicator" class="row-fluid main-container hide"> <div class="inner-container"> - <div class="span12 inner-container"> + <div class="inner-container"> <div class="row-fluid"> <div class="span12 welcome-div alignCenter"> <h3>{vtranslate('LBL_INSTALLATION_IN_PROGRESS','Install')}...</h3><br>