X-Git-Url: https://git.harvie.cz/?a=blobdiff_plain;f=wwwroot%2Finc%2Fsmarty%2Fnode_methodz%2Ffunction.merge_arrays.php;h=d81b8f41bfff53c0dbfc65d69ef8969a7b1f7a8f;hb=45fe16f2bfbe95069118ca82222113023754db0e;hp=e7320d2742fe0f4dab3c71e204243d97276ed326;hpb=f2e47e33e5b2753b886980b52b26641a62d9bec9;p=mirrors%2FKyberia-bloodline.git

diff --git a/wwwroot/inc/smarty/node_methodz/function.merge_arrays.php b/wwwroot/inc/smarty/node_methodz/function.merge_arrays.php
index e7320d2..d81b8f4 100644
--- a/wwwroot/inc/smarty/node_methodz/function.merge_arrays.php
+++ b/wwwroot/inc/smarty/node_methodz/function.merge_arrays.php
@@ -4,6 +4,8 @@
 
 		$array1=$params['array1'];
 		$array2=$params['array2'];
+		if(!is_array($array1)) $array1=array();
+		if(!is_array($array2)) $array2=array();
 		$sort_by=$params['sort_by'];
 		$orderby=$params['orderby'];
 		if ($orderby=='asc') $order=SORT_ASC;