diff options
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/feeds.php | 6 | ||||
| -rw-r--r-- | classes/pref/users.php | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/classes/feeds.php b/classes/feeds.php index b5010a05f..d6cd2a255 100644 --- a/classes/feeds.php +++ b/classes/feeds.php @@ -388,6 +388,8 @@ class Feeds extends Handler_Protected { $feed_icon_img = "<img class=\"tinyFeedIcon\" src=\"images/pub_set.svg\" alt=\"\">"; } + $entry_site_url = $line["site_url"]; + if (!get_pref($this->link, 'COMBINED_DISPLAY_MODE')) { if (get_pref($this->link, 'VFEED_GROUP_BY_FEED')) { @@ -474,7 +476,7 @@ class Feeds extends Handler_Protected { unset($line["tag_cache"]); $line["content"] = sanitize($this->link, $line["content_preview"], - false, false, $feed_site_url); + false, false, $entry_site_url); foreach ($pluginhost->get_hooks($pluginhost::HOOK_RENDER_ARTICLE_CDM) as $p) { $line = $p->hook_render_article_cdm($line); @@ -614,8 +616,6 @@ class Feeds extends Handler_Protected { } } - $feed_site_url = $line["site_url"]; - $reply['content'] .= "<span id=\"CWRAP-$id\">"; $reply['content'] .= $line["content"]; $reply['content'] .= "</span>"; diff --git a/classes/pref/users.php b/classes/pref/users.php index 0d7ca3c6e..d36ed29f7 100644 --- a/classes/pref/users.php +++ b/classes/pref/users.php @@ -214,7 +214,7 @@ class Pref_Users extends Handler_Protected { } db_query($this->link, "UPDATE ttrss_users SET $pass_query_part login = '$login', - access_level = '$access_level', email = '$email', otp_enabled = 'false' + access_level = '$access_level', email = '$email', otp_enabled = false WHERE id = '$uid'"); } |