Prevent calling end on stdClass, fixes ThingEngineer#1001

RivenSkaye · Jul 24, 2023 · d181606 · d181606
1 parent 3f6f76f
commit d181606
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/MysqliDb.php b/MysqliDb.php
@@ -1689,7 +1689,12 @@ protected function _dynamicBindResults(mysqli_stmt $stmt)
             }
             $this->count++;
             if ($this->_mapKey) {
-                $results[$row[$this->_mapKey]] = count($row) > 2 ? $result : end($result);
+                if (count($row) < 3 && $this->returnType == 'object') {
+                    $res = new ArrayIterator($result);
+                    $res->seek($_res->count() - 1);
+                    $results[$row[$this->_mapKey]] = $res->current();
+                }
+                else $results[$row[$this->_mapKey]] = count($row) > 2 ? $result : end($result);
             } else {
                 array_push($results, $result);
             }