Browse files

Merge branch 'hotfix/3958' into develop

Forward port #3958
  • Loading branch information...
2 parents 1b43cd6 + d2b0cb6 commit aa01d5a950eb62dbc1091d214b387823109dcd53 @weierophinney weierophinney committed May 10, 2013
Showing with 2 additions and 5 deletions.
  1. +2 −5 library/Zend/Db/Adapter/Driver/Oci8/Result.php
View
7 library/Zend/Db/Adapter/Driver/Oci8/Result.php
@@ -145,14 +145,11 @@ public function current()
*/
protected function loadData()
{
- $this->currentComplete = false;
- $this->currentData = null;
-
+ $this->currentComplete = true;
$this->currentData = oci_fetch_assoc($this->resource);
if ($this->currentData !== false) {
$this->position++;
- $this->currentComplete = true;
return true;
}
return false;
@@ -192,7 +189,7 @@ public function rewind()
public function valid()
{
if ($this->currentComplete) {
- return true;
+ return ($this->currentData !== false);
}
return $this->loadData();

0 comments on commit aa01d5a

Please sign in to comment.