Merge branch 'master' into hookhead

[tt-rss.git] / include / functions.php

diff --git a/include/functions.php b/include/functions.php
index cf35d6fa2dee9b4cdb02893fb528d96c2d904019..556b8a8cdf0c3c99de569c744dca99fd6e8fa62d 100644 (file)
--- 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, content as content_preview, cached_content, ";
+
+                       $content_query_part = "content, content AS content_preview, cached_content, ";
+
 
                        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'));