remove some unnecessary element IDs

[tt-rss.git] / classes / feeds.php

diff --git a/classes/feeds.php b/classes/feeds.php
index 48e3337e02ebe4eb17fdcf8e3b372f9281e40735..d6da225e8afe20322415c48be63fbda2276c7b29 100755 (executable)
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -417,7 +417,7 @@ class Feeds extends Handler_Protected {
 
                                        $reply['content'] .= "<div onclick='return hlClicked(event, $id)'
                     class=\"hlTitle\"><span class='hlContent $hlc_suffix'>";
-                                       $reply['content'] .= "<a id=\"RTITLE-$id\" class=\"title $hlc_suffix\"
+                                       $reply['content'] .= "<a class=\"title $hlc_suffix\"
                     href=\"" . htmlspecialchars($line["link"]) . "\"
                     onclick=\"\">" .
                                                truncate_string($line["title"], 200);
@@ -496,7 +496,7 @@ class Feeds extends Handler_Protected {
                                                }
                                        }
 
-                    $content_encoded = htmlspecialchars(json_encode($line["content"]));
+                    $content_encoded = htmlspecialchars($line["content"]);
 
                     $tmp_content = "<div class=\"cdm expanded $hlc_suffix $class\"
                         id=\"RROW-$id\" data-content=\"$content_encoded\" data-article-id='$id' data-orig-feed-id='$feed_id' $mouseover_attrs>";
@@ -523,7 +523,7 @@ class Feeds extends Handler_Protected {
                                        }
 
                                        // data-article-id included for context menu
-                                       $tmp_content .= "<span id=\"RTITLE-$id\"
+                                       $tmp_content .= "<span
                     onclick=\"return cdmClicked(event, $id);\"
                     data-article-id=\"$id\"
                     class=\"titleWrap hlMenuAttach $hlc_suffix\">
@@ -536,10 +536,6 @@ class Feeds extends Handler_Protected {
 
                                        $tmp_content .= $labels_str;
 
-                                       $tmp_content .= "<span class='collapseBtn' style='display : none'>
-                    <img src=\"images/collapse.png\" onclick=\"cdmCollapseArticle(event, $id)\"
-                    title=\"".__("Collapse article")."\"/></span>";
-
                                        $tmp_content .= "</span>";
 
                                        if (!$vfeed_group_enabled) {
@@ -568,7 +564,7 @@ class Feeds extends Handler_Protected {
 
                                        $tmp_content .= "</div>"; //cdmHeader
 
-                                       $tmp_content .= "<div class=\"cdmContent\" onclick=\"return cdmClicked(event, $id, true);\" id=\"CICD-$id\">";
+                                       $tmp_content .= "<div class=\"cdmContent\" onclick=\"return cdmClicked(event, $id, true);\">";
 
                                        $tmp_content .= "<div id=\"POSTNOTE-$id\">";
                                        if ($line['note']) {