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

master
Andrew Dolgov 4 years ago
commit 9f6237a1b8

@ -485,7 +485,7 @@ class Config {
} }
// ttrss_users won't be there on initial startup (before migrations are done) // ttrss_users won't be there on initial startup (before migrations are done)
if (!Config::is_migration_needed() && self::get(Config::SINGLE_USER_MODE) && class_exists("PDO")) { if (!Config::is_migration_needed() && self::get(Config::SINGLE_USER_MODE)) {
if (UserHelper::get_login_by_id(1) != "admin") { if (UserHelper::get_login_by_id(1) != "admin") {
array_push($errors, "SINGLE_USER_MODE is enabled but default admin account (ID: 1) is not found."); array_push($errors, "SINGLE_USER_MODE is enabled but default admin account (ID: 1) is not found.");
} }

@ -142,7 +142,7 @@ class Share extends Plugin {
$line); $line);
$enclosures = Article::_get_enclosures($line["id"]); $enclosures = Article::_get_enclosures($line["id"]);
list ($og_image, $og_stream) = Article::_get_image($enclosures, $line['content'], $line["site_url"], $line); list ($og_image, $og_stream) = Article::_get_image($enclosures, $line['content'], $line["site_url"] ?? "", $line);
$content_decoded = html_entity_decode($line["title"], ENT_NOQUOTES | ENT_HTML401); $content_decoded = html_entity_decode($line["title"], ENT_NOQUOTES | ENT_HTML401);
$parsed_updated = TimeHelper::make_local_datetime($line["updated"], true, $owner_uid, true); $parsed_updated = TimeHelper::make_local_datetime($line["updated"], true, $owner_uid, true);

Loading…
Cancel
Save