diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/functions.php | 15 | ||||
| -rw-r--r-- | include/rssfuncs.php | 2 |
2 files changed, 6 insertions, 11 deletions
diff --git a/include/functions.php b/include/functions.php index 603a865a1..d71f81ac4 100644 --- a/include/functions.php +++ b/include/functions.php @@ -71,7 +71,6 @@ "hu_HU" => "Magyar (Hungarian)", "it_IT" => "Italiano", "ja_JP" => "日本語 (Japanese)", - "ko_KR" => "한국어 (Korean)", "lv_LV" => "Latviešu", "nb_NO" => "Norwegian bokmål", "nl_NL" => "Dutch", @@ -1059,7 +1058,7 @@ $date_qpart = "date_entered < DATE_SUB(NOW(), INTERVAL 1 WEEK) "; } break; - case "2week": + case "2weeks": if (DB_TYPE == "pgsql") { $date_qpart = "date_entered < NOW() - INTERVAL '2 week' "; } else { @@ -2579,7 +2578,9 @@ } } - $content_query_part = "content as content_preview, cached_content, "; + + $content_query_part = "content, content AS content_preview, "; + if (is_numeric($feed)) { @@ -2750,13 +2751,10 @@ if ($site_url) { - if ($entry->hasAttribute('href')) { + if ($entry->hasAttribute('href')) $entry->setAttribute('href', rewrite_relative_url($site_url, $entry->getAttribute('href'))); - $entry->setAttribute('rel', 'noreferrer'); - } - if ($entry->hasAttribute('src')) { $src = rewrite_relative_url($site_url, $entry->getAttribute('src')); @@ -3106,8 +3104,7 @@ tag_cache, author, orig_feed_id, - note, - cached_content + note FROM ttrss_entries,ttrss_user_entries WHERE id = '$id' AND ref_id = id AND owner_uid = $owner_uid"); diff --git a/include/rssfuncs.php b/include/rssfuncs.php index e2837a3b5..cfb0e7a46 100644 --- a/include/rssfuncs.php +++ b/include/rssfuncs.php @@ -671,7 +671,6 @@ updated, content, content_hash, - cached_content, no_orig_date, date_updated, date_entered, @@ -686,7 +685,6 @@ '$entry_timestamp_fmt', '$entry_content', '$content_hash', - '', $no_orig_date, NOW(), '$date_feed_processed', |