queryFeedHeadlines: remove obsolete content_preview

diff --git a/classes/api.php b/classes/api.php
index e3fcc8d3d3e73aad4b7f27bbaca71d6b87046005..8e279521a51997c281d71e7619c07d147728a60b 100644 (file)
--- a/classes/api.php
+++ b/classes/api.php
@@ -642,7 +642,7 @@ class API extends Handler {
                        $headlines = array();
 
                        while ($line = db_fetch_assoc($result)) {
-                               $line["content_preview"] = truncate_string(strip_tags($line["content_preview"]), 100);
+                               $line["content_preview"] = truncate_string(strip_tags($line["content"]), 100);
                                foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_QUERY_HEADLINES) as $p) {
                                        $line = $p->hook_query_headlines($line, 100, true);
                                }

diff --git a/classes/feeds.php b/classes/feeds.php
index 2c17a225788ad454d0c335e4fcfeed806f51d90c..5fc75cb2fdddaefde68479e3c63651aac65b8758 100644 (file)
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -292,7 +292,7 @@ class Feeds extends Handler_Protected {
                        $expand_cdm = get_pref('CDM_EXPANDED');
 
                        while ($line = $this->dbh->fetch_assoc($result)) {
-                               $line["content_preview"] =  "— " . truncate_string(strip_tags($line["content_preview"]), 250);
+                               $line["content_preview"] =  "— " . truncate_string(strip_tags($line["content"]), 250);
 
                                foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_QUERY_HEADLINES) as $p) {
                                        $line = $p->hook_query_headlines($line, 250, false);

diff --git a/classes/handler/public.php b/classes/handler/public.php
index 86e58fd6863aaa26005e2a9a7137fdb99baf3a5e..037e6bf0f46cc767abc845c2425fba3da4eefe26 100644 (file)
--- a/classes/handler/public.php
+++ b/classes/handler/public.php
@@ -91,7 +91,7 @@ class Handler_Public extends Handler {
 
                        $tpl->setVariable('SELF_URL', htmlspecialchars(get_self_url_prefix()), true);
                        while ($line = $this->dbh->fetch_assoc($result)) {
-                               $line["content_preview"] = truncate_string(strip_tags($line["content_preview"]), 100, '...');
+                               $line["content_preview"] = truncate_string(strip_tags($line["content"]), 100, '...');
 
                                foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_QUERY_HEADLINES) as $p) {
                                        $line = $p->hook_query_headlines($line);

diff --git a/classes/pref/filters.php b/classes/pref/filters.php
index 87e63cc2d106a40d85441c9b008aba4a930c5c81..43da6d04dd996c5fb229f7eef2189b91b3111896 100644 (file)
--- a/classes/pref/filters.php
+++ b/classes/pref/filters.php
@@ -97,7 +97,7 @@ class Pref_Filters extends Handler_Protected {
                print "<table width=\"100%\" cellspacing=\"0\" id=\"prefErrorFeedList\">";
 
                while ($line = $this->dbh->fetch_assoc($result)) {
-                       $line["content_preview"] = truncate_string(strip_tags($line["content_preview"]), 100, '...');
+                       $line["content_preview"] = truncate_string(strip_tags($line["content"]), 100, '...');
 
                        foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_QUERY_HEADLINES) as $p) {
                                        $line = $p->hook_query_headlines($line, 100);

diff --git a/include/functions.php b/include/functions.php
index 28a51b232a0778d9caf6b83933734962bf22833a..f7e910ad3c986b8bcfcc9d9e3782ff3b7c38b2a6 100644 (file)
--- a/include/functions.php
+++ b/include/functions.php
@@ -2651,7 +2651,7 @@
                        }
 
 
-                       $content_query_part = "content, content AS content_preview, ";
+                       $content_query_part = "content, ";
 
 
                        if (is_numeric($feed)) {