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

Merge pull request #7437 from MrPetovan/bug/fatal-errors

Browse source 
Replace last instance of Contact::select
This commit is contained in:
Michael Vogel 2019-07-28 10:19:28 +02:00 committed by GitHub
commit eddcb5ebe9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
include/api.php
View file

@ -6223,13 +6223,10 @@ function api_friendica_profile_show($type)
// select all users from contact table, loop and prepare standard return for user data
$users = [];
$nurls = Contact::select(['id', 'nurl'], ['uid' => api_user(), 'profile-id' => $rr['id']]);
if (DBA::isResult($nurls)) {
foreach ($nurls as $nurl) {
$user = api_get_user($a, $nurl['nurl']);
($type == "xml") ? $users[$k++ . ":user"] = $user : $users[] = $user;
}
$nurls = Contact::selectToArray(['id', 'nurl'], ['uid' => api_user(), 'profile-id' => $rr['id']]);
foreach ($nurls as $nurl) {
$user = api_get_user($a, $nurl['nurl']);
($type == "xml") ? $users[$k++ . ":user"] = $user : $users[] = $user;
}
$profile['users'] = $users;

4
src/Database/Database.php
View file

@ -1512,16 +1512,18 @@ class Database
public function toArray($stmt, $do_close = true)
{
if (is_bool($stmt)) {
return $stmt;
return [];
}
$data = [];
while ($row = $this->fetch($stmt)) {
$data[] = $row;
}
if ($do_close) {
$this->close($stmt);
}
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 $params Array of several parameters
*
* @return boolean|array
* @return array
*
* @throws \Exception
* @see \Friendica\Database\DBA::selectToArray
@ -55,7 +55,7 @@ class Attach extends BaseObject
$fields = self::getFields();
}
$r = DBA::selectToArray('attach', $fields, $conditions, $params);
return DBA::selectToArray('attach', $fields, $conditions, $params);
}
/**

4
src/Model/Item.php
View file

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