remove unused cached_content

diff --git a/classes/api.php b/classes/api.php
index 03fb6eab1904193ec349f5e3996bba31bb050802..c1f4aa9fafab47c345b5e2956063ad5395cd1078 100644 (file)
--- a/classes/api.php
+++ b/classes/api.php
@@ -309,7 +309,7 @@ class API extends Handler {
 
                if ($article_id) {
 
-                       $query = "SELECT id,title,link,content,cached_content,feed_id,comments,int_id,
+                       $query = "SELECT id,title,link,content,feed_id,comments,int_id,
                                marked,unread,published,score,
                                ".SUBSTRING_FOR_DATE."(updated,1,16) as updated,
                                author,(SELECT title FROM ttrss_feeds WHERE id = feed_id) AS feed_title
@@ -338,7 +338,7 @@ class API extends Handler {
                                                "comments" => $line["comments"],
                                                "author" => $line["author"],
                                                "updated" => (int) strtotime($line["updated"]),
-                                               "content" => $line["cached_content"] != "" ? $line["cached_content"] : $line["content"],
+                                               "content" => $line["content"],
                                                "feed_id" => $line["feed_id"],
                                                "attachments" => $attachments,
                                                "score" => (int)$line["score"],
@@ -674,10 +674,6 @@ class API extends Handler {
 
                                if ($show_content) {
 
-                                       if ($line["cached_content"] != "") {
-                                               $line["content"] =& $line["cached_content"];
-                                       }
-
                                        if ($sanitize_content) {
                                                $headline_row["content"] = sanitize(
                                                        $line["content"],

diff --git a/include/functions.php b/include/functions.php
index 8c25d9008be8df86243d08abc09617bea668091d..d71f81ac4f7c001990a22a3a69da8c341dec9158 100644 (file)
--- a/include/functions.php
+++ b/include/functions.php
@@ -2579,7 +2579,7 @@
                        }
 
 
-                       $content_query_part = "content, content AS content_preview, cached_content, ";
+                       $content_query_part = "content, content AS content_preview, ";
 
 
                        if (is_numeric($feed)) {
@@ -3104,8 +3104,7 @@
                        tag_cache,
                        author,
                        orig_feed_id,
-                       note,
-                       cached_content
+                       note
                        FROM ttrss_entries,ttrss_user_entries
                        WHERE   id = '$id' AND ref_id = id AND owner_uid = $owner_uid");
 

diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index e2837a3b56caa245471f081647165493640e6c69..cfb0e7a46e2dcb8ba21a51f86965ffc6e8d51ba4 100644 (file)
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -671,7 +671,6 @@
                                                        updated,
                                                        content,
                                                        content_hash,
-                                                       cached_content,
                                                        no_orig_date,
                                                        date_updated,
                                                        date_entered,
@@ -686,7 +685,6 @@
                                                        '$entry_timestamp_fmt',
                                                        '$entry_content',
                                                        '$content_hash',
-                                                       '',
                                                        $no_orig_date,
                                                        NOW(),
                                                        '$date_feed_processed',