valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'Fix PHP8 strtime warning if argument is null' (#83) from mechnich/tt-rss:master into master 

Reviewed-on: https://dev.tt-rss.org/fox/tt-rss/pulls/83
This commit is contained in:
fox 2022-09-28 19:34:43 +03:00
parent d47b8c8494 359f0af2e7
commit 051fc29b55
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
classes/api.php
View File

@ -333,7 +333,7 @@ class API extends Handler {
'published' => self::_param_to_bool($entry->published), 'published' => self::_param_to_bool($entry->published),
'comments' => $entry->comments, 'comments' => $entry->comments,
'author' => $entry->author, 'author' => $entry->author,
'updated' => (int) strtotime($entry->updated), 'updated' => (int) strtotime($entry->updated ?? ''),
'feed_id' => $entry->feed_id, 'feed_id' => $entry->feed_id,
'attachments' => Article::_get_enclosures($entry->id), 'attachments' => Article::_get_enclosures($entry->id),
'score' => (int) $entry->score, 'score' => (int) $entry->score,
@ -618,7 +618,7 @@ class API extends Handler {
'unread' => (int) $unread, 'unread' => (int) $unread,
'has_icon' => $has_icon, 'has_icon' => $has_icon,
'cat_id' => (int) $feed->cat_id, 'cat_id' => (int) $feed->cat_id,
'last_updated' => (int) strtotime($feed->last_updated), 'last_updated' => (int) strtotime($feed->last_updated ?? ''),
'order_id' => (int) $feed->order_id, 'order_id' => (int) $feed->order_id,
]; ];
@ -648,7 +648,7 @@ class API extends Handler {
->find_one($feed_id); ->find_one($feed_id);
if ($feed) { if ($feed) {
$last_updated = strtotime($feed->last_updated); $last_updated = strtotime($feed->last_updated ?? '');
$cache_images = self::_param_to_bool($feed->cache_images); $cache_images = self::_param_to_bool($feed->cache_images);
if (!$cache_images && time() - $last_updated > 120) { if (!$cache_images && time() - $last_updated > 120) {
@ -725,7 +725,7 @@ class API extends Handler {
"unread" => self::_param_to_bool($line["unread"]), "unread" => self::_param_to_bool($line["unread"]),
"marked" => self::_param_to_bool($line["marked"]), "marked" => self::_param_to_bool($line["marked"]),
"published" => self::_param_to_bool($line["published"]), "published" => self::_param_to_bool($line["published"]),
"updated" => (int)strtotime($line["updated"]), "updated" => (int)strtotime($line["updated"] ?? ''),
"is_updated" => $is_updated, "is_updated" => $is_updated,
"title" => $line["title"], "title" => $line["title"],
"link" => $line["link"], "link" => $line["link"],