removes the Everything folder

1 files changed, 5 insertions, 5 deletions

diff --git a/lib/feedmapper.php b/lib/feedmapper.php
index 3d11ff0e6..df310730d 100644
--- a/lib/feedmapper.php
+++ b/lib/feedmapper.php
@@ -80,13 +80,13 @@ class FeedMapper {
 	}
 
 	/**
-	 * @brief Retrieve a feed from the database
-	 * @param id The id of the feed in the database table.
-	 * @returns an instance of OC_News_Feed
+	 * @brief Retrieve all the feeds contained in the folder $folderid
+	 * @param folderid The id of the folder in the database table.
+	 * @returns a list of feeds
 	 */
 	public function findByFolderId($folderid){
-		$stmt = \OCP\DB::prepare('SELECT * FROM ' . self::tableName . ' WHERE folder_id = ?');
-		$result = $stmt->execute(array($folderid));
+		$stmt = \OCP\DB::prepare('SELECT * FROM ' . self::tableName . ' WHERE user_id = ? AND folder_id = ?');
+		$result = $stmt->execute(array($this->userid, $folderid));
 		$feeds = array();
 		while ($row = $result->fetchRow()) {
 			$url = $row['url'];