Fix merge.

horde · Jun 5, 2015 · e3c7ec4 · e3c7ec4
1 parent 3956351
commit e3c7ec4
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Data/Query/History/Base.php b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Data/Query/History/Base.php
@@ -58,11 +58,13 @@ class Horde_Kolab_Storage_Data_Query_History_Base
      *
      * @param Horde_Kolab_Storage_Data $data   The queriable data.
      * @param array                    $params Additional parameters.
+     *   - factory:  (Horde_Kolab_Storage_Factory)  The factory object.
+     *
      */
     public function __construct(Horde_Kolab_Storage_Data $data, $params)
     {
         $this->_data = $data;
-        $this->_history = $this->factory->createHistory($data->getAuth());
+        $this->_history = $params['factory']->createHistory($data->getAuth());
     }
 
     /**