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

remove cache_content remnants

Browse Source
This commit is contained in:
Andrew Dolgov
2013-03-16 16:11:58 +04:00
parent cc38c8e549
commit 8349a32e75
4 changed files with 2 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
classes/feeds.php
View File

@@ -165,15 +165,14 @@ class Feeds extends Handler_Protected {
// Update the feed if required with some basic flood control
$result = db_query($this->link,
"SELECT cache_images,cache_content,".SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated
"SELECT cache_images,".SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated
FROM ttrss_feeds WHERE id = '$feed'");
if (db_num_rows($result) != 0) {
$last_updated = strtotime(db_fetch_result($result, 0, "last_updated"));
$cache_images = sql_bool_to_bool(db_fetch_result($result, 0, "cache_images"));
$cache_content = sql_bool_to_bool(db_fetch_result($result, 0, "cache_content"));
if (!$cache_images && !$cache_content && time() - $last_updated > 120 || isset($_REQUEST['DevForceUpdate'])) {
if (!$cache_images && time() - $last_updated > 120 || isset($_REQUEST['DevForceUpdate'])) {
include "rssfuncs.php";
update_rss_feed($this->link, $feed, true, true);
} else {
@@ -224,7 +223,6 @@ class Feeds extends Handler_Protected {
$feed_title = $qfh_ret[1];
$feed_site_url = $qfh_ret[2];
$last_error = $qfh_ret[3];
$cache_content = true;
$vgroup_last_feed = $vgr_last_feed;
@@ -618,10 +616,6 @@ class Feeds extends Handler_Protected {
$feed_site_url = $line["site_url"];
if ($cache_content && $line["cached_content"] != "") {
$line["content_preview"] =& $line["cached_content"];
}
$reply['content'] .= "<span id=\"CWRAP-$id\">";
$reply['content'] .= $line["content"];
$reply['content'] .= "</span>";