From 8df3f79040c191550966e32c043861268cd7d94a Mon Sep 17 00:00:00 2001 From: "Michael J. Rubinsky" Date: Fri, 30 Jul 2010 18:09:17 -0400 Subject: [PATCH] Fix array_merge usage. --- framework/ActiveSync/lib/Horde/ActiveSync/Driver/Base.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/framework/ActiveSync/lib/Horde/ActiveSync/Driver/Base.php b/framework/ActiveSync/lib/Horde/ActiveSync/Driver/Base.php index cf685599b..8293fd4b2 100644 --- a/framework/ActiveSync/lib/Horde/ActiveSync/Driver/Base.php +++ b/framework/ActiveSync/lib/Horde/ActiveSync/Driver/Base.php @@ -147,7 +147,7 @@ abstract class Horde_ActiveSync_Driver_Base /* Override any security policies */ if (!empty($params['policies'])) { - array_merge($this->_policies, $params['policies']); + $this->_policies = array_merge($this->_policies, $params['policies']); } } @@ -626,4 +626,4 @@ abstract class Horde_ActiveSync_Driver_Base return ""; } -} \ No newline at end of file +} -- 2.11.0