From 2b753e21b9f9171478ed456d1b4390387c5cbce8 Mon Sep 17 00:00:00 2001 From: "Michael J. Rubinsky" Date: Mon, 23 Nov 2009 14:02:51 -0500 Subject: [PATCH] Fix array_merge --- kronolith/lib/Resource/Base.php | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/kronolith/lib/Resource/Base.php b/kronolith/lib/Resource/Base.php index 966611ad2..0979c0a96 100644 --- a/kronolith/lib/Resource/Base.php +++ b/kronolith/lib/Resource/Base.php @@ -46,12 +46,11 @@ abstract class Kronolith_Resource_Base throw new Horde_Exception('Required \'name\' attribute missing from resource calendar'); } - array_merge($params, array('description' => '', - 'response_type' => Kronolith_Resource::RESPONSETYPE_MANUAL, - 'members' => '', - 'type' => Kronolith_Resource::TYPE_SINGLE)); - - $this->_params = $params; + $this->_params = array_merge(array('description' => '', + 'response_type' => Kronolith_Resource::RESPONSETYPE_MANUAL, + 'members' => '', + 'type' => Kronolith_Resource::TYPE_SINGLE), + $params); } /** -- 2.11.0