Revert "[jan] Only return requested type from Horde_Kolab_Storage_Dat…

…a_Base#fetch() if different types are in the same folder." This would break reporting of errors from parsing the Kolab objects. This reverts commit cd52bc5.
horde · Nov 18, 2013 · cbdba3d · cbdba3d
1 parent 0aeeac5
commit cbdba3d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Data/Base.php b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Data/Base.php
@@ -356,9 +356,7 @@ public function fetch($uids, $raw = false)
             $object = new Horde_Kolab_Storage_Object();
             $object->setDriver($this->_driver);
             $object->load($uid, $this->_folder, $writer, $structure['structure']);
-            if ($object->getType() == $this->_type) {
-                $objects[$uid] = $object;
-            }
+            $objects[$uid] = $object;
         }
         return $objects;
     }

diff --git a/framework/Kolab_Storage/package.xml b/framework/Kolab_Storage/package.xml
@@ -23,7 +23,7 @@
  </stability>
  <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
  <notes>
-* [jan] Only return requested type from Horde_Kolab_Storage_Data_Base#fetch() if different types are in the same folder.
+*
  </notes>
  <contents>
   <dir baseinstalldir="/" name="/">
@@ -1333,7 +1333,7 @@
    <date>2013-08-27</date>
    <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
    <notes>
-* [jan] Only return requested type from Horde_Kolab_Storage_Data_Base#fetch() if different types are in the same folder.
+*
    </notes>
   </release>
  </changelog>