From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Sun, 28 Oct 2012 06:59:27 +0000 (+0400)
Subject: fix rpc/cdmGetArticle for archived articles
X-Git-Tag: 1.6.1~54
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=9a0e28f4dab1c80425152b24a05f01b9d95a982b;p=tt-rss.git

fix rpc/cdmGetArticle for archived articles
---

diff --git a/classes/rpc.php b/classes/rpc.php
index f0d1d3d8..018bede2 100644
--- a/classes/rpc.php
+++ b/classes/rpc.php
@@ -703,11 +703,12 @@ class RPC extends Handler_Protected {
 			$id = (int)$id;
 
 			$result = db_query($this->link, "SELECT content,
-					ttrss_feeds.site_url AS site_url FROM ttrss_user_entries, ttrss_feeds,
+					ttrss_feeds.site_url AS site_url FROM ttrss_user_entries
+					LEFT JOIN ttrss_feeds ON (ttrss_feeds.id = ttrss_user_entries.feed_id),
 					ttrss_entries
-					WHERE feed_id = ttrss_feeds.id AND ref_id = '$id' AND
-					ttrss_entries.id = ref_id AND
-					ttrss_user_entries.owner_uid = ".$_SESSION["uid"]);
+						WHERE ref_id = '$id' AND
+						ttrss_entries.id = ref_id AND
+						ttrss_user_entries.owner_uid = ".$_SESSION["uid"]);
 
 			if (db_num_rows($result) != 0) {
 				$line = db_fetch_assoc($result);