]> git.mxchange.org Git - friendica.git/commitdiff
Use a better function to add the element to the beginning of the array
authorMichael <heluecht@pirati.ca>
Sun, 17 Jan 2021 13:10:32 +0000 (13:10 +0000)
committerMichael <heluecht@pirati.ca>
Sun, 17 Jan 2021 13:10:32 +0000 (13:10 +0000)
include/api.php

index 31cffc180bc4752842d66b2c5e41e61b0574f8c4..63df897ee074681237de7abd822f21e4f704ba93 100644 (file)
@@ -2171,17 +2171,17 @@ function api_statuses_mentions($type)
 
        $start = max(0, ($page - 1) * $count);
 
+       $query = "`gravity` IN (?, ?) AND `id` IN (SELECT `iid` FROM `user-item`                
+               WHERE (`hidden` IS NULL OR NOT `hidden`) AND
+                       `uid` = ? AND `notification-type` & ? != 0
+                       AND `iid` > ?";
+
        $condition = [GRAVITY_PARENT, GRAVITY_COMMENT, api_user(),
                UserItem::NOTIF_EXPLICIT_TAGGED | UserItem::NOTIF_IMPLICIT_TAGGED |
                UserItem::NOTIF_THREAD_COMMENT | UserItem::NOTIF_DIRECT_COMMENT |
                UserItem::NOTIF_DIRECT_THREAD_COMMENT,
                $since_id];
 
-       $query = "`gravity` IN (?, ?) AND `id` IN (SELECT `iid` FROM `user-item`                
-               WHERE (`hidden` IS NULL OR NOT `hidden`) AND
-                       `uid` = ? AND `notification-type` & ? != 0
-                       AND `iid` > ?";
-
        if ($max_id > 0) {
                $query .= " AND `iid` <= ?";
                $condition[] = $max_id;
@@ -2189,7 +2189,7 @@ function api_statuses_mentions($type)
 
        $query .= ")";
 
-       $condition = array_merge([$query], $condition);
+       array_unshift($condition, $query);
 
        $params = ['order' => ['id' => true], 'limit' => [$start, $count]];
        $statuses = Post::selectForUser(api_user(), [], $condition, $params);