From 57ab8584866e6578bc30749a3d44320221602ed4 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Mon, 7 Jan 2019 13:26:54 -0500 Subject: [PATCH] Fix calls to DBA::select missing parameters --- mod/network.php | 2 +- src/Model/Attach.php | 2 +- src/Model/Contact.php | 4 ++-- src/Model/Item.php | 2 +- src/Model/Photo.php | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/mod/network.php b/mod/network.php index e05f9814a0..f7dbc14ede 100644 --- a/mod/network.php +++ b/mod/network.php @@ -449,7 +449,7 @@ function networkFlatView(App $a, $update = 0) $condition = ["`term` = ? AND `otype` = ? AND `type` = ? AND `uid` = ?", $file, TERM_OBJ_POST, TERM_FILE, local_user()]; $params = ['order' => ['tid' => true], 'limit' => [$pager->getStart(), $pager->getItemsPerPage()]]; - $result = DBA::select('term', ['oid'], $condition); + $result = DBA::select('term', ['oid'], $condition, $params); $posts = []; while ($term = DBA::fetch($result)) { diff --git a/src/Model/Attach.php b/src/Model/Attach.php index 9be77eca91..bfd5199bd5 100644 --- a/src/Model/Attach.php +++ b/src/Model/Attach.php @@ -50,7 +50,7 @@ class Attach extends BaseObject public static function select(array $fields = [], array $conditions = [], array $params = []) { if (empty($fields)) { - $selected = self::getFields(); + $fields = self::getFields(); } $r = DBA::select('attach', $fields, $conditions, $params); diff --git a/src/Model/Contact.php b/src/Model/Contact.php index 2b7aada795..a92b7777d3 100644 --- a/src/Model/Contact.php +++ b/src/Model/Contact.php @@ -662,7 +662,7 @@ class Contact extends BaseObject { if (!isset($contact['url']) && !empty($contact['id'])) { $fields = ['id', 'url', 'archive', 'self', 'term-date']; - $contact = DBA::selectFirst('contact', [], ['id' => $contact['id']]); + $contact = DBA::selectFirst('contact', $fields, ['id' => $contact['id']]); if (!DBA::isResult($contact)) { return; } @@ -725,7 +725,7 @@ class Contact extends BaseObject if (!isset($contact['url']) && !empty($contact['id'])) { $fields = ['id', 'url', 'batch']; - $contact = DBA::selectFirst('contact', [], ['id' => $contact['id']]); + $contact = DBA::selectFirst('contact', $fields, ['id' => $contact['id']]); if (!DBA::isResult($contact)) { return; } diff --git a/src/Model/Item.php b/src/Model/Item.php index bc3d58c4a5..27ffb2480e 100644 --- a/src/Model/Item.php +++ b/src/Model/Item.php @@ -2019,7 +2019,7 @@ class Item extends BaseObject $condition = ['id' => $itemid, 'uid' => 0, 'network' => [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS, ""], 'visible' => true, 'deleted' => false, 'moderated' => false, 'private' => false]; - $item = self::selectFirst(self::ITEM_FIELDLIST, ['id' => $itemid]); + $item = self::selectFirst(self::ITEM_FIELDLIST, $condition); if (!DBA::isResult($item)) { return; } diff --git a/src/Model/Photo.php b/src/Model/Photo.php index 67ab217cd4..1cee2f633b 100644 --- a/src/Model/Photo.php +++ b/src/Model/Photo.php @@ -41,7 +41,7 @@ class Photo extends BaseObject public static function select(array $fields = [], array $conditions = [], array $params = []) { if (empty($fields)) { - $selected = self::getFields(); + $fields = self::getFields(); } $r = DBA::select("photo", $fields, $conditions, $params);