Changeset 23022 for branches/version-2_13-dev/data/module/MDB2/Iterator.php

Timestamp:

2013/08/02 13:22:57 (11 years ago)

Author:

Seasoft

Message:

#2322 (セッションのGC処理がエラーとなる)

File:

• branches/version-2_13-dev/data/module/MDB2/Iterator.php (modified) (4 diffs)

branches/version-2_13-dev/data/module/MDB2/Iterator.php

@@ -43 +43 @@
 // +----------------------------------------------------------------------+
 //
-// $Id: Iterator.php,v 1.22 2006/05/06 14:03:41 lsmith Exp $
+// $Id: Iterator.php 327310 2012-08-27 15:16:18Z danielc $
 
 /**
@@ -55 +55 @@
 {
     protected $fetchmode;
+    /**
+     * @var MDB2_Result_Common
+     */
     protected $result;
     protected $row;
@@ -63 +66 @@
      * Constructor
      */
-    public function __construct($result, $fetchmode = MDB2_FETCHMODE_DEFAULT)
+    public function __construct(MDB2_Result_Common $result, $fetchmode = MDB2_FETCHMODE_DEFAULT)
     {
         $this->result = $result;
@@ -113 +116 @@
     public function current()
     {
-        if (is_null($this->row)) {
+        if (null === $this->row) {
             $row = $this->result->fetchRow($this->fetchmode);
-            if (PEAR::isError($row)) {
+            if (MDB2::isError($row)) {
                 $row = false;
             }