summaryrefslogtreecommitdiff
path: root/backend.php
diff options
context:
space:
mode:
Diffstat (limited to 'backend.php')
-rw-r--r--backend.php14
1 files changed, 10 insertions, 4 deletions
diff --git a/backend.php b/backend.php
index 6129a17c6..194d8ccd6 100644
--- a/backend.php
+++ b/backend.php
@@ -959,14 +959,20 @@
$feed_kind = "Labels";
}
+ if (!$vfeed_query_part) {
+ $content_query_part = "content as content_preview,";
+ } else {
+ $content_query_part = "";
+ }
+
$result = db_query($link, "SELECT
id,title,
SUBSTRING(updated,1,16) as updated,
unread,feed_id,marked,link,last_read,
SUBSTRING(last_read,1,19) as last_read_noms,
$vfeed_query_part
- SUBSTRING(updated,1,19) as updated_noms,
- content as content_preview
+ $content_query_part
+ SUBSTRING(updated,1,19) as updated_noms
FROM
ttrss_entries,ttrss_user_entries
WHERE
@@ -989,8 +995,8 @@
marked,link,last_read,
SUBSTRING(last_read,1,19) as last_read_noms,
$vfeed_query_part
- SUBSTRING(updated,1,19) as updated_noms,
- content
+ $content_query_part
+ SUBSTRING(updated,1,19) as updated_noms
FROM
ttrss_entries,ttrss_user_entries,ttrss_tags
WHERE