diff --git a/functions.php b/functions.php
index 11ebf7b8c..f7ce20dda 100644
--- a/functions.php
+++ b/functions.php
@@ -3490,7 +3490,7 @@
ttrss_entries.id,ttrss_entries.title,
updated,
note,
- unread,feed_id,marked,published,link,last_read,
+ unread,feed_id,marked,published,link,last_read,orig_feed_id,
".SUBSTRING_FOR_DATE."(last_read,1,19) as last_read_noms,
$vfeed_query_part
$content_query_part
@@ -3522,7 +3522,7 @@
note,
ttrss_entries.id as id,title,
updated,
- unread,feed_id,
+ unread,feed_id,orig_feed_id,
marked,link,last_read,
".SUBSTRING_FOR_DATE."(last_read,1,19) as last_read_noms,
$vfeed_query_part
@@ -5130,20 +5130,12 @@
$is_unread = false;
}
- $is_ie = (strpos($_SESSION["client.userAgent"], "MSIE") !== false);
-
- if ($is_ie) {
- $mark_img_ext = "gif";
- } else {
- $mark_img_ext = "png";
- }
-
if ($line["marked"] == "t" || $line["marked"] == "1") {
- $marked_pic = "";
} else {
- $marked_pic = "
";
}
@@ -5409,6 +5401,33 @@
onclick=\"cdmClicked($id)\"
id=\"CICD-$id\" $cdm_cstyle>";
+ if ($line["orig_feed_id"]) {
+
+ $tmp_result = db_query($link, "SELECT * FROM ttrss_archived_feeds
+ WHERE id = ".$line["orig_feed_id"]);
+
+ if (db_num_rows($tmp_result) != 0) {
+
+ print "
";
+
+ print "