From: Jan Schneider <jan@horde.org>
Date: Thu, 19 Nov 2009 00:44:16 +0000 (+0100)
Subject: Fix merge order.
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=e00fdb8cdd03f079a4fe2c08d8a11ae505e27a08;p=horde.git

Fix merge order.
---

diff --git a/timeobjects/lib/Driver.php b/timeobjects/lib/Driver.php
index ac14190aa..97f467da3 100644
--- a/timeobjects/lib/Driver.php
+++ b/timeobjects/lib/Driver.php
@@ -8,7 +8,7 @@ class TimeObjects_Driver
 
     public function __construct($params)
     {
-        $this->_params = array_merge($params, $this->_params);
+        $this->_params = array_merge($this->_params, $params);
     }
 
     /**