From: Michael J. Rubinsky <mrubinsk@horde.org>
Date: Fri, 30 Jul 2010 22:09:17 +0000 (-0400)
Subject: Fix array_merge usage.
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=8df3f79040c191550966e32c043861268cd7d94a;p=horde.git

Fix array_merge usage.
---

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
+}