diff options
Diffstat (limited to 'classes/article.php')
| -rwxr-xr-x | classes/article.php | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/classes/article.php b/classes/article.php index e113ed219..609ddeebe 100755 --- a/classes/article.php +++ b/classes/article.php @@ -177,7 +177,7 @@ class Article extends Handler_Protected { $sth = $this->pdo->prepare("UPDATE ttrss_user_entries SET score = ? WHERE ref_id IN ($ids_qmarks) AND owner_uid = ?"); - $sth->execute(array_merge([$score], $ids, [$_SESSION['uid']])); + $sth->execute([$score, ...$ids, $_SESSION['uid']]); print json_encode(["id" => $ids, "score" => $score]); } @@ -293,6 +293,7 @@ class Article extends Handler_Protected { } /** + * @param int $id article id * @return array{'formatted': string, 'entries': array<int, array<string, mixed>>} */ static function _format_enclosures(int $id, bool $always_display_enclosures, string $article_content, bool $hide_images = false): array { @@ -446,7 +447,7 @@ class Article extends Handler_Protected { $rv = []; - $cache = new DiskCache("images"); + $cache = DiskCache::instance("images"); foreach ($encs as $enc) { $cache_key = sha1($enc->content_url); @@ -507,7 +508,7 @@ class Article extends Handler_Protected { WHERE ref_id IN ($ids_qmarks) AND owner_uid = ?"); } - $sth->execute(array_merge($ids, [$owner_uid])); + $sth->execute([...$ids, $owner_uid]); } /** @@ -639,7 +640,7 @@ class Article extends Handler_Protected { $article_stream = UrlHelper::rewrite_relative($site_url, $article_stream); } - $cache = new DiskCache("images"); + $cache = DiskCache::instance("images"); if ($article_image && $cache->exists(sha1($article_image))) $article_image = $cache->get_url(sha1($article_image)); |