public/tt-rss
1
0
Fork 0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2025-12-13 21:25:55 +00:00
Code Issues Releases Wiki Activity

Merge branch 'hookhead' of git://github.com/justauserx/Tiny-Tiny-RSS into justauserx-hookhead

Browse Source
This commit is contained in:
Andrew Dolgov
2013-07-10 16:41:48 +04:00
parent baf3fcf93a 425a6edc6b
commit f48d89fd58
8 changed files with 97 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/functions.php
View File

@@ -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'));