Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-11-19 05:03:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

Ensure *toArray returns an array

Browse source
This commit is contained in:
Hypolite Petovan 2019-07-28 00:03:42 -04:00
parent b684fffcb7
commit a61ce4fed0
3 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Database/Database.php
View file

@ -1512,16 +1512,18 @@ class Database
public function toArray($stmt, $do_close = true) public function toArray($stmt, $do_close = true)
{ {
if (is_bool($stmt)) { if (is_bool($stmt)) {
return $stmt; return [];
} }
$data = []; $data = [];
while ($row = $this->fetch($stmt)) { while ($row = $this->fetch($stmt)) {
$data[] = $row; $data[] = $row;
} }
if ($do_close) { if ($do_close) {
$this->close($stmt); $this->close($stmt);
} }
return $data; return $data;
} }

4
src/Model/Attach.php
View file

@ -44,7 +44,7 @@ class Attach extends BaseObject
* @param array $conditions Array of fields for conditions * @param array $conditions Array of fields for conditions
* @param array $params Array of several parameters * @param array $params Array of several parameters
* *
* @return boolean|array * @return array
* *
* @throws \Exception * @throws \Exception
* @see \Friendica\Database\DBA::selectToArray * @see \Friendica\Database\DBA::selectToArray
@ -55,7 +55,7 @@ class Attach extends BaseObject
$fields = self::getFields(); $fields = self::getFields();
} }
$r = DBA::selectToArray('attach', $fields, $conditions, $params); return DBA::selectToArray('attach', $fields, $conditions, $params);
} }
/** /**

10
src/Model/Item.php
View file

@ -383,16 +383,10 @@ class Item extends BaseObject
$result = self::select($fields, $condition, $params); $result = self::select($fields, $condition, $params);
if (is_bool($result)) { if (is_bool($result)) {
return $result; return [];
} }
$data = []; return DBA::toArray($result);
while ($row = self::fetch($result)) {
$data[] = $row;
}
DBA::close($result);
return $data;
} }
/** /**