diff options
| author | fox <[email protected]> | 2022-08-17 19:38:15 +0300 |
|---|---|---|
| committer | fox <[email protected]> | 2022-08-17 19:38:15 +0300 |
| commit | 60658be5bc35192f9b2d9aaf413454f29fe51316 (patch) | |
| tree | d7f6aa1b6bf3eaa4d7a9601e46e15441bc737d9e /classes/pref/feeds.php | |
| parent | ec764f97e7e3e0fac20f93364c84dfa01651bf95 (diff) | |
| parent | 0dbed700efa77355839a4d2cddf02f93203dc96f (diff) | |
Merge pull request 'Use PHP 7.4 features' (#77) from wn/tt-rss:feature/php-7.4-stuff into master
Reviewed-on: https://dev.tt-rss.org/fox/tt-rss/pulls/77
Diffstat (limited to 'classes/pref/feeds.php')
| -rwxr-xr-x | classes/pref/feeds.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php index bb638f166..6cf979b0a 100755 --- a/classes/pref/feeds.php +++ b/classes/pref/feeds.php @@ -172,7 +172,7 @@ class Pref_Feeds extends Handler_Protected { if ($enable_cats) { array_push($root['items'], $cat); } else { - $root['items'] = array_merge($root['items'], $cat['items']); + array_push($root['items'], ...$cat['items']); } $sth = $this->pdo->prepare("SELECT * FROM @@ -202,7 +202,7 @@ class Pref_Feeds extends Handler_Protected { if ($enable_cats) { array_push($root['items'], $cat); } else { - $root['items'] = array_merge($root['items'], $cat['items']); + array_push($root['items'], ...$cat['items']); } } } @@ -848,7 +848,7 @@ class Pref_Feeds extends Handler_Protected { if ($qpart) { $sth = $this->pdo->prepare("UPDATE ttrss_feeds SET $qpart WHERE id IN ($feed_ids_qmarks) AND owner_uid = ?"); - $sth->execute(array_merge($feed_ids, [$_SESSION['uid']])); + $sth->execute([...$feed_ids, $_SESSION['uid']]); } } |