valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove processing of ttrss_feeds.icon_url

This commit is contained in:
Andrew Dolgov 2013-02-08 17:19:43 +04:00
parent 8853f0ed5b
commit 750cfcd2fa
3 changed files with 1 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/functions.php
View File

@ -2852,7 +2852,6 @@
$result = db_query($link, "SELECT id,title,link,content,feed_id,comments,int_id, $result = db_query($link, "SELECT id,title,link,content,feed_id,comments,int_id,
".SUBSTRING_FOR_DATE."(updated,1,16) as updated, ".SUBSTRING_FOR_DATE."(updated,1,16) as updated,
(SELECT icon_url FROM ttrss_feeds WHERE id = feed_id) as icon_url,
(SELECT site_url FROM ttrss_feeds WHERE id = feed_id) as site_url, (SELECT site_url FROM ttrss_feeds WHERE id = feed_id) as site_url,
num_comments, num_comments,
tag_cache, tag_cache,
@ -2867,12 +2866,6 @@
$line = db_fetch_assoc($result); $line = db_fetch_assoc($result);
if ($line["icon_url"]) {
$feed_icon = "<img src=\"" . $line["icon_url"] . "\">";
} else {
$feed_icon = "&nbsp;";
}
$feed_site_url = $line['site_url']; $feed_site_url = $line['site_url'];
$num_comments = $line["num_comments"]; $num_comments = $line["num_comments"];
@ -3012,11 +3005,6 @@
} }
$rv['content'] .= "</div>"; $rv['content'] .= "</div>";
$rv['content'] .= "<div class=\"postIcon\">" .
"<a target=\"_blank\" title=\"".__("Visit the website")."\"$
href=\"".htmlspecialchars($feed_site_url)."\">".
$feed_icon . "</a></div>";
$rv['content'] .= "<div class=\"postContent\">"; $rv['content'] .= "<div class=\"postContent\">";
// N-grams // N-grams

10
include/rssfuncs.php
View File

@ -285,13 +285,12 @@
$favicon_interval_qpart = "favicon_last_checked < DATE_SUB(NOW(), INTERVAL 12 HOUR)"; $favicon_interval_qpart = "favicon_last_checked < DATE_SUB(NOW(), INTERVAL 12 HOUR)";
} }
$result = db_query($link, "SELECT title,icon_url,site_url,owner_uid, $result = db_query($link, "SELECT title,site_url,owner_uid,
(favicon_last_checked IS NULL OR $favicon_interval_qpart) AS (favicon_last_checked IS NULL OR $favicon_interval_qpart) AS
favicon_needs_check favicon_needs_check
FROM ttrss_feeds WHERE id = '$feed'"); FROM ttrss_feeds WHERE id = '$feed'");
$registered_title = db_fetch_result($result, 0, "title"); $registered_title = db_fetch_result($result, 0, "title");
$orig_icon_url = db_fetch_result($result, 0, "icon_url");
$orig_site_url = db_fetch_result($result, 0, "site_url"); $orig_site_url = db_fetch_result($result, 0, "site_url");
$favicon_needs_check = sql_bool_to_bool(db_fetch_result($result, 0, $favicon_needs_check = sql_bool_to_bool(db_fetch_result($result, 0,
"favicon_needs_check")); "favicon_needs_check"));
@ -328,13 +327,6 @@
site_url = '$site_url' WHERE id = '$feed'"); site_url = '$site_url' WHERE id = '$feed'");
} }
$icon_url = db_escape_string(mb_substr(
rewrite_relative_url($fetch_url, $rss->get_image_url()), 0, 245));
if ($icon_url && $orig_icon_url != $icon_url) {
db_query($link, "UPDATE ttrss_feeds SET icon_url = '$icon_url' WHERE id = '$feed'");
}
if ($debug_enabled) { if ($debug_enabled) {
_debug("update_rss_feed: loading filters & labels..."); _debug("update_rss_feed: loading filters & labels...");
} }

11
tt-rss.css
View File

@ -60,17 +60,6 @@ div.postReply div.postContent img {
max-width : 98%; max-width : 98%;
} }
div.postReply div.postIcon {
float : right;
border : 0px;
margin : 5px;
}
div.postReply div.postIcon img {
max-width : 120px;
display : inline;
}
div.postReply div.postEnclosures { div.postReply div.postEnclosures {
margin-top : 1em; margin-top : 1em;
color : gray; color : gray;