[Vtigercrm-commits] [vtiger-commits] r5104 - /vtigercrm/trunk/include/utils/EditViewUtils.php

[vtigercrm-commits at vtiger.fosslabs.com]

Author: saraj
Date: Thu Apr 13 06:51:00 2006
New Revision: 5104

Log:
changes made in usage of array_merge in PHP5

Modified:
    vtigercrm/trunk/include/utils/EditViewUtils.php

Modified: vtigercrm/trunk/include/utils/EditViewUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/EditViewUtils.php (original)
+++ vtigercrm/trunk/include/utils/EditViewUtils.php Thu Apr 13 06:51:00 2006
@@ -1288,13 +1288,13 @@
 	{
 		if($label == '')
 		{
-			$returndata[$mod_strings[$curBlock]]=array_merge($returndata[$mod_strings[$curBlock]],$editview_arr[$blockid]);
+			$returndata[$mod_strings[$curBlock]]=array_merge((array)$returndata[$mod_strings[$curBlock]],(array)$editview_arr[$blockid]);
 		}
 		else
 		{
 			$curBlock = $label;
 			if(is_array($editview_arr[$blockid]))
-				$returndata[$mod_strings[$label]]=array_merge($returndata[$mod_strings[$label]],$editview_arr[$blockid]);
+				$returndata[$mod_strings[$label]]=array_merge((array)$returndata[$mod_strings[$label]],(array)$editview_arr[$blockid]);
 		}
 	}
 	return $returndata;