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 63991f00c695eaed8abe565ee6196a8c932ff89a..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;
@@
-27,16
+29,6
@@
$array=array_merge($array1,$array2);
$array=array_merge($array1,$array2);
- /*
- if ($_SESSION['user_id']==548) {
- print_r($array1);
- echo "LALALA";
- print_r($array2);
- echo "AAAAAA";
- print_r($array);
- }
- */
-
if ($sort_by=='thread') {
$i=0;
for($i=0; $i<count($array); $i++){
if ($sort_by=='thread') {
$i=0;
for($i=0; $i<count($array); $i++){
@@
-55,9
+47,7
@@
}
}
-// if ($_SESSION['user_id']==548) print_r($array);
-
$smarty->assign('merged',$array);
}
$smarty->assign('merged',$array);
}
-?>
\ No newline at end of file
+?>
This page took
0.121008 seconds
and
4
git commands to generate.