tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-01 05:39:10 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #381 from AngryPHPNerd/patch-2

Browse Source 
MINOR: Colliding field check runs twice
This commit is contained in:
Sam Minnée 2012-05-02 14:14:40 -07:00
commit a004acfb59
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
model/MySQLDatabase.php
View File

@ -1158,18 +1158,10 @@ class MySQLQuery extends SS_Query {
public function numRecords() {
if(is_object($this->handle)) return $this->handle->num_rows;
}
public function nextRecord() {
if(is_object($this->handle) && $data = $this->handle->fetch_row()) {
$output = array();
$this->handle->field_seek(0);
while($field = $this->handle->fetch_field()) {
$columnName = $field->name;
if(isset($data[$this->handle->current_field-1]) || !isset($output[$columnName])) {
$output[$columnName] = $data[$this->handle->current_field-1];
}
}
return $output;
if(is_object($this->handle) && ($data = $this->handle->fetch_assoc())) {
return $data;
} else {
return false;
}