move getArticleFeed to Article

move print_label_select to controls

2 files changed, 13 insertions, 1 deletions

diff --git a/classes/article.php b/classes/article.php
index 2e7a05e0b..b842ea40b 100644
--- a/classes/article.php
+++ b/classes/article.php
@@ -80,7 +80,7 @@ class Article extends Handler_Protected {
 			WHERE ref_id = '$id' AND owner_uid = " . $_SESSION["uid"]);
 		}
 
-		$feed_id = getArticleFeed($id);
+		$feed_id = $this->getArticleFeed($id);
 		ccache_update($feed_id, $_SESSION["uid"]);
 	}
 
@@ -371,6 +371,16 @@ class Article extends Handler_Protected {
 		print json_encode($reply);
 	}
 
+	function getArticleFeed($id) {
+		$result = db_query("SELECT feed_id FROM ttrss_user_entries
+			WHERE ref_id = '$id' AND owner_uid = " . $_SESSION["uid"]);
+
+		if (db_num_rows($result) != 0) {
+			return db_fetch_result($result, 0, "feed_id");
+		} else {
+			return 0;
+		}
+	}
 
 
 }
diff --git a/classes/feeds.php b/classes/feeds.php
index 4c4972d76..4d4707a94 100755
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -1241,5 +1241,7 @@ class Feeds extends Handler_Protected {
 		<?php
 
 	}
+
+
 }
 ?>