Merge pull request zendframework#1609 from EvanDotPro/hotfix/skip-hyd…

…ration-if-no-result Skip DB row object hydration if ResultSet is empty
guilhermewop · Jun 26, 2012 · 08bdc99 · 08bdc99
2 parents 5f25a4c + 1f9f598
commit 08bdc99
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/library/Zend/Db/ResultSet/HydratingResultSet.php b/library/Zend/Db/ResultSet/HydratingResultSet.php
@@ -91,7 +91,7 @@ public function current()
     {
         $data = $this->dataSource->current();
         $object = clone $this->objectPrototype;
-        return $this->hydrator->hydrate($data, $object);
+        return is_array($data) ? $this->hydrator->hydrate($data, $object) : false;
     }
 
 }