Index: branches/5.2.x/core/units/helpers/language_import_helper.php =================================================================== diff -u -N -r15238 -r15239 --- branches/5.2.x/core/units/helpers/language_import_helper.php (.../language_import_helper.php) (revision 15238) +++ branches/5.2.x/core/units/helpers/language_import_helper.php (.../language_import_helper.php) (revision 15239) @@ -1,6 +1,6 @@ Application->getUnitOption($prefix, 'TableName') . ' WHERE ' . $this->Application->getUnitOption($prefix, 'IDField') . ' IN (' . $ids . ')'; - $rs = $this->Conn->QueryRaw($sql); + $rows = $this->Conn->GetIterator($sql); - if ( $this->Conn->RowCount($rs) ) { + if ( count($rows) ) { $data = ''; - while ( ($row = $this->Conn->GetNextRow($rs)) ) { + foreach ($rows as $row) { $data .= ',' . $row[$key_field]; } $data = substr($data, 1); } - - $this->Conn->Destroy($rs); } if ( !is_array($data) ) { @@ -1205,18 +1203,16 @@ $sql = str_replace('COUNT(*) AS count', $list->TableName . '.' . $list->IDField, $sql); $ids = ''; - $rs = $this->Conn->QueryRaw($sql); + $rows = $this->Conn->GetIterator($sql); - if ( $this->Conn->RowCount($rs) ) { - while ( ($row = $this->Conn->GetNextRow($rs)) ) { + if ( count($rows) ) { + foreach ($rows as $row) { $ids .= ',' . $row[$list->IDField]; } $ids = substr($ids, 1); } - $this->Conn->Destroy($rs); - return $ids; } } \ No newline at end of file