diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/backend-rpc.php | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/modules/backend-rpc.php b/modules/backend-rpc.php index dd6ea2694..54bf4a326 100644 --- a/modules/backend-rpc.php +++ b/modules/backend-rpc.php @@ -576,22 +576,25 @@ } $result = db_query($link, - "SELECT DISTINCT id,title,guid,link, + "SELECT DISTINCT id,title,guid,link,comments, feed_id,content,updated,unread,marked FROM ttrss_user_entries,ttrss_entries WHERE $unread_qpart $cid_qpart $date_qpart ref_id = id AND owner_uid = ".$_SESSION["uid"]." ORDER BY updated DESC LIMIT $limit OFFSET $skip"); - - while ($line = db_fetch_assoc($result)) { - print "<article><![CDATA["; - $line["marked"] = (int)sql_bool_to_bool($line["marked"]); - $line["unread"] = (int)sql_bool_to_bool($line["unread"]); - $line["tags"] = format_tags_string(get_article_tags($link, $id), $id); + if (function_exists('json_encode')) { - print json_encode($line); - print "]]></article>"; + while ($line = db_fetch_assoc($result)) { + print "<article><![CDATA["; + + $line["marked"] = (int)sql_bool_to_bool($line["marked"]); + $line["unread"] = (int)sql_bool_to_bool($line["unread"]); + $line["tags"] = format_tags_string(get_article_tags($link, $id), $id); + + print json_encode($line); + print "]]></article>"; + } } } |