From: Andrew Dolgov <fox@madoka.spb.ru>
Date: Thu, 17 May 2007 12:42:14 +0000 (+0100)
Subject: get feed_id from article ref_id in outputArticleXML()
X-Git-Tag: schema_freeze_for_1.2.11~15
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=10eb9da8572c3729053d0052493d82200e5e1dcf;p=tt-rss.git

get feed_id from article ref_id in outputArticleXML()
---

diff --git a/functions.php b/functions.php
index b12689fb..3cfcef87 100644
--- a/functions.php
+++ b/functions.php
@@ -3401,6 +3401,14 @@
 
 	function outputArticleXML($link, $id, $feed_id, $mark_as_read = true) {
 
+		/* we can figure out feed_id from article id anyway, why do we
+		 * pass feed_id here? */
+
+		$result = db_query($link, "SELECT feed_id FROM ttrss_user_entries
+			WHERE ref_id = '$id'");
+
+		$feed_id = db_fetch_result($result, 0, "feed_id");
+
 		print "<article id='$id'><![CDATA[";
 
 		$result = db_query($link, "SELECT rtl_content FROM ttrss_feeds
@@ -3594,7 +3602,7 @@
 		}
 
 		if (preg_match("/^-?[0-9][0-9]*$/", $feed) != false) {
-	
+
 			$result = db_query($link, "SELECT rtl_content FROM ttrss_feeds
 				WHERE id = '$feed' AND owner_uid = " . $_SESSION["uid"]);