Merge branch 'master' of http://code.vtiger.com/vtiger/vtigercrm

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;
 }
 

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>