GIT.Harvie.CZ
/
mirrors
/
Kyberia-bloodline.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
removing warnings
[mirrors/Kyberia-bloodline.git]
/
wwwroot
/
inc
/
smarty
/
node_methodz
/
function.merge_arrays.php
diff --git
a/wwwroot/inc/smarty/node_methodz/function.merge_arrays.php
b/wwwroot/inc/smarty/node_methodz/function.merge_arrays.php
index e7320d2742fe0f4dab3c71e204243d97276ed326..d81b8f41bfff53c0dbfc65d69ef8969a7b1f7a8f 100644
(file)
--- 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'];
$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;
$sort_by=$params['sort_by'];
$orderby=$params['orderby'];
if ($orderby=='asc') $order=SORT_ASC;
This page took
0.105376 seconds
and
4
git commands to generate.