diff options
| author | Andrew Dolgov <[email protected]> | 2013-07-10 16:41:48 +0400 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2013-07-10 16:41:48 +0400 |
| commit | f48d89fd58aa25a171f3c4f6ab5c7fdaaae35f02 (patch) | |
| tree | 8ba1a6e8f683ceb8342ab9c81dc5e487ea50966e /include | |
| parent | baf3fcf93a7d911a8b85ec54eb3435d91bddf6b7 (diff) | |
| parent | 425a6edc6b3e84d0cc0ed144ab66421adac33fa5 (diff) | |
Merge branch 'hookhead' of git://github.com/justauserx/Tiny-Tiny-RSS into justauserx-hookhead
Diffstat (limited to 'include')
| -rw-r--r-- | include/functions.php | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/include/functions.php b/include/functions.php index 603a865a1..8c25d9008 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, 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')); |