Fix calls to DBA::select missing parameters

diff --git a/mod/network.php b/mod/network.php
index e05f9814a0c23ec8a9c2a943362d56ab8f971345..f7dbc14ede369e35c4a5d52f7a71a59877402d5d 100644 (file)
--- 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 9be77eca91bb161d01d026b9fa5999e44ba5f57e..bfd5199bd5778fb211e01a587ae6fd0e37ab3c17 100644 (file)
--- 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 2b7aada795b97488bb3e79f6b3e96e64f7c3c6b9..a92b7777d33587d3ac62dc95e4a815f3fa093235 100644 (file)
--- 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 bc3d58c4a5f84b4ebe685c5963dfe2356f6725f8..27ffb2480e07416b8ae3900698398cd108c425d3 100644 (file)
--- 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 67ab217cd4782fac9262f96444ccc432beed9686..1cee2f633becf122a3ebb8dfa8bde55199b1d6fb 100644 (file)
--- 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);