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

Merge branch 'master' of git.tt-rss.org:fox/tt-rss

This commit is contained in:
Andrew Dolgov 2022-10-01 19:01:33 +03:00
parent 6cbdbd261e 54942b7664
commit c654f02a53
No known key found for this signature in database
GPG Key ID: 1A56B4FA25D4AF2A
7 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
classes/counters.php
View File

@ -193,7 +193,7 @@ class Counters {
} }
// hide default un-updated timestamp i.e. 1970-01-01 (?) -fox // hide default un-updated timestamp i.e. 1970-01-01 (?) -fox
if ((int)date('Y') - (int)date('Y', strtotime($line['last_updated'])) > 2) if ((int)date('Y') - (int)date('Y', strtotime($line['last_updated'] ?? '')) > 2)
$last_updated = ''; $last_updated = '';
$cv = [ $cv = [

2
classes/digest.php
View File

@ -22,7 +22,7 @@ class Digest
while ($line = $res->fetch()) { while ($line = $res->fetch()) {
if (get_pref(Prefs::DIGEST_ENABLE, $line['id'])) { if (get_pref(Prefs::DIGEST_ENABLE, $line['id'])) {
$preferred_ts = strtotime(get_pref(Prefs::DIGEST_PREFERRED_TIME, $line['id'])); $preferred_ts = strtotime(get_pref(Prefs::DIGEST_PREFERRED_TIME, $line['id']) ?? '');
// try to send digests within 2 hours of preferred time // try to send digests within 2 hours of preferred time
if ($preferred_ts && time() >= $preferred_ts && if ($preferred_ts && time() >= $preferred_ts &&

6
classes/feeditem/atom.php
View File

@ -19,19 +19,19 @@ class FeedItem_Atom extends FeedItem_Common {
$updated = $this->elem->getElementsByTagName("updated")->item(0); $updated = $this->elem->getElementsByTagName("updated")->item(0);
if ($updated) { if ($updated) {
return strtotime($updated->nodeValue); return strtotime($updated->nodeValue ?? '');
} }
$published = $this->elem->getElementsByTagName("published")->item(0); $published = $this->elem->getElementsByTagName("published")->item(0);
if ($published) { if ($published) {
return strtotime($published->nodeValue); return strtotime($published->nodeValue ?? '');
} }
$date = $this->xpath->query("dc:date", $this->elem)->item(0); $date = $this->xpath->query("dc:date", $this->elem)->item(0);
if ($date) { if ($date) {
return strtotime($date->nodeValue); return strtotime($date->nodeValue ?? '');
} }
// consistent with strtotime failing to parse // consistent with strtotime failing to parse

4
classes/feeditem/rss.php
View File

@ -17,13 +17,13 @@ class FeedItem_RSS extends FeedItem_Common {
$pubDate = $this->elem->getElementsByTagName("pubDate")->item(0); $pubDate = $this->elem->getElementsByTagName("pubDate")->item(0);
if ($pubDate) { if ($pubDate) {
return strtotime($pubDate->nodeValue); return strtotime($pubDate->nodeValue ?? '');
} }
$date = $this->xpath->query("dc:date", $this->elem)->item(0); $date = $this->xpath->query("dc:date", $this->elem)->item(0);
if ($date) { if ($date) {
return strtotime($date->nodeValue); return strtotime($date->nodeValue ?? '');
} }
// consistent with strtotime failing to parse // consistent with strtotime failing to parse

6
classes/handler/public.php
View File

@ -128,9 +128,9 @@ class Handler_Public extends Handler {
$tpl->setVariable('ARTICLE_CONTENT', $content, true); $tpl->setVariable('ARTICLE_CONTENT', $content, true);
$tpl->setVariable('ARTICLE_UPDATED_ATOM', $tpl->setVariable('ARTICLE_UPDATED_ATOM',
date('c', strtotime($line["updated"])), true); date('c', strtotime($line["updated"] ?? '')), true);
$tpl->setVariable('ARTICLE_UPDATED_RFC822', $tpl->setVariable('ARTICLE_UPDATED_RFC822',
date(DATE_RFC822, strtotime($line["updated"])), true); date(DATE_RFC822, strtotime($line["updated"] ?? '')), true);
$tpl->setVariable('ARTICLE_AUTHOR', htmlspecialchars($line['author']), true); $tpl->setVariable('ARTICLE_AUTHOR', htmlspecialchars($line['author']), true);
@ -214,7 +214,7 @@ class Handler_Public extends Handler {
$article['title'] = $line['title']; $article['title'] = $line['title'];
$article['excerpt'] = $line["content_preview"]; $article['excerpt'] = $line["content_preview"];
$article['content'] = Sanitizer::sanitize($line["content"], false, $owner_uid, $feed_site_url, null, $line["id"]); $article['content'] = Sanitizer::sanitize($line["content"], false, $owner_uid, $feed_site_url, null, $line["id"]);
$article['updated'] = date('c', strtotime($line["updated"])); $article['updated'] = date('c', strtotime($line["updated"] ?? ''));
if (!empty($line['note'])) $article['note'] = $line['note']; if (!empty($line['note'])) $article['note'] = $line['note'];
if (!empty($line['author'])) $article['author'] = $line['author']; if (!empty($line['author'])) $article['author'] = $line['author'];

4
include/errorhandler.php
View File

@ -43,14 +43,12 @@ function format_backtrace($trace): string {
} }
function ttrss_error_handler(int $errno, string $errstr, string $file, int $line): bool { function ttrss_error_handler(int $errno, string $errstr, string $file, int $line): bool {
/*if (version_compare(PHP_VERSION, '8.0.0', '<')) { if (version_compare(PHP_VERSION, '8.0.0', '<')) {
if (error_reporting() == 0 || !$errno) return false; if (error_reporting() == 0 || !$errno) return false;
} else { } else {
if (!(error_reporting() & $errno)) return false; if (!(error_reporting() & $errno)) return false;
} }
if (error_reporting() == 0 || !$errno) return false;*/
$file = substr(str_replace(dirname(__DIR__), "", $file), 1); $file = substr(str_replace(dirname(__DIR__), "", $file), 1);
$context = format_backtrace(debug_backtrace()); $context = format_backtrace(debug_backtrace());

2
plugins/af_psql_trgm/init.php
View File

@ -122,7 +122,7 @@ class Af_Psql_Trgm extends Plugin {
print "</div>"; print "</div>";
print "<div style='text-align : right' class='text-muted'>" . TimeHelper::smart_date_time(strtotime($line["updated"])) . "</div>"; print "<div style='text-align : right' class='text-muted'>" . TimeHelper::smart_date_time(strtotime($line["updated"] ?? '')) . "</div>";
print "</li>"; print "</li>";
} }