From bd143eec642b3e7e0d0dab18ca30b2d6b6cd0bae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cornelius=20Wei=C3=9F?= Date: Fri, 11 Nov 2005 21:51:00 +0000 Subject: [PATCH] php < 5.1 fixes --- calendar/inc/class.bocal.inc.php | 2 +- calendar/inc/class.socal.inc.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/calendar/inc/class.bocal.inc.php b/calendar/inc/class.bocal.inc.php index 27fa775f40..1c8f6e28cb 100644 --- a/calendar/inc/class.bocal.inc.php +++ b/calendar/inc/class.bocal.inc.php @@ -1523,7 +1523,7 @@ if (!function_exists('array_intersect_key')) // php5.1 function $intersection = $keys = array(); foreach(func_get_args() as $arr) { - $keys[] = array_keys($arr); + $keys[] = array_keys((array)$arr); } foreach(call_user_func_array('array_intersect',$keys) as $key) { diff --git a/calendar/inc/class.socal.inc.php b/calendar/inc/class.socal.inc.php index 6937d89f75..14b0848748 100644 --- a/calendar/inc/class.socal.inc.php +++ b/calendar/inc/class.socal.inc.php @@ -357,7 +357,7 @@ class socal $row['alarm'] = array(); $row['recur_exception'] = $row['recur_exception'] ? explode(',',$row['recur_exception']) : array(); - $events[$id] =& $row; + $events[$id] = $row; } if (count($events))