[Vtigercrm-commits] [vtiger-commits] r9539 - /vtigercrm/branches/5.0.1/include/utils/utils.php

[vtigercrm-commits at vtiger.fosslabs.com]

Author: richie
Date: Mon Sep 25 04:52:10 2006
New Revision: 9539

Log:
Quick fix for Firefox toolbar - contribution by Devis

Modified:
    vtigercrm/branches/5.0.1/include/utils/utils.php

Modified: vtigercrm/branches/5.0.1/include/utils/utils.php
==============================================================================
--- vtigercrm/branches/5.0.1/include/utils/utils.php (original)
+++ vtigercrm/branches/5.0.1/include/utils/utils.php Mon Sep 25 04:52:10 2006
@@ -837,7 +837,8 @@
 	$log->debug("Entering to_html(".$string.",".$encode.") method ...");
         global $toHtml;
         if($encode && is_string($string)){//$string = htmlentities($string, ENT_QUOTES);
-        $string = str_replace(array_keys($toHtml), array_values($toHtml), $string);
+		if (is_array($toHtml))
+        		$string = str_replace(array_keys($toHtml), array_values($toHtml), $string);
         }
 	$log->debug("Exiting to_html method ...");
         return $string;