diff options
| -rw-r--r-- | digest.js | 9 | ||||
| -rw-r--r-- | modules/backend-rpc.php | 14 |
2 files changed, 10 insertions, 13 deletions
@@ -134,9 +134,12 @@ function zoom(elem, article_id) { onComplete: function(transport) { fatal_error_check(transport); - if (transport.responseXML) { - var article = transport.responseXML.getElementsByTagName('article')[0]; - elem.innerHTML = article.firstChild.nodeValue; + var reply = JSON.parse(transport.responseText); + + if (reply) { + var article = reply['article']; + + elem.innerHTML = article.content; new Effect.BlindDown(elem, {duration : 0.5}); diff --git a/modules/backend-rpc.php b/modules/backend-rpc.php index 7c26d2ec4..fe4b6d302 100644 --- a/modules/backend-rpc.php +++ b/modules/backend-rpc.php @@ -608,24 +608,18 @@ } if ($subop == "digest-get-contents") { + header("Content-Type: text/plain"); + $article_id = db_escape_string($_REQUEST['article_id']); $result = db_query($link, "SELECT content FROM ttrss_entries, ttrss_user_entries WHERE id = '$article_id' AND ref_id = id AND owner_uid = ".$_SESSION['uid']); - print "<rpc-reply>"; - - print "<article id=\"$article_id\"><![CDATA["; - $content = sanitize_rss($link, db_fetch_result($result, 0, "content")); - print $content; - - print "]]></article>"; - - print "</rpc-reply>"; - + print json_encode(array("article" => + array("id" => $id, "content" => $content))); return; } |