From 999f2552032d4f37e2918dfa57caef7f92f28879 Mon Sep 17 00:00:00 2001 From: "J. King" Date: Mon, 27 Nov 2017 13:05:08 -0500 Subject: [PATCH] Fixes for bugs uncovered during client testing --- dist/nginx.conf | 2 +- lib/REST/TinyTinyRSS/API.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dist/nginx.conf b/dist/nginx.conf index 94cff1cc..79005677 100644 --- a/dist/nginx.conf +++ b/dist/nginx.conf @@ -45,6 +45,6 @@ server { # Tiny Tiny RSS special-feed icons location /tt-rss/images/ { root /usr/share/arsse/www; - try_files $uri; + try_files $uri =404; } } \ No newline at end of file diff --git a/lib/REST/TinyTinyRSS/API.php b/lib/REST/TinyTinyRSS/API.php index c8c0a907..4417a33b 100644 --- a/lib/REST/TinyTinyRSS/API.php +++ b/lib/REST/TinyTinyRSS/API.php @@ -1188,7 +1188,7 @@ class API extends \JKingWeb\Arsse\REST\AbstractHandler { 'post_id' => $article['id'], ]] : [], // TODO: We need to support multiple enclosures 'score' => 0, // score is not implemented as it is not modifiable from the TTRSS API - 'note' => strlen($article['note']) ? $article['note'] : null, + 'note' => strlen((string) $article['note']) ? $article['note'] : null, 'lang' => "", // FIXME: picoFeed should be able to retrieve this information 'content' => $article['content'], ]; @@ -1262,7 +1262,7 @@ class API extends \JKingWeb\Arsse\REST\AbstractHandler { 'feed_id' => $article['subscription'], 'feed_title' => $article['subscription_title'], 'score' => 0, // score is not implemented as it is not modifiable from the TTRSS API - 'note' => strlen($article['note']) ? $article['note'] : null, + 'note' => strlen((string) $article['note']) ? $article['note'] : null, 'lang' => "", // FIXME: picoFeed should be able to retrieve this information 'tags' => Arsse::$db->articleCategoriesGet(Arsse::$user->id, $article['id']), 'comments_count' => 0,