1 files changed, 13 insertions, 4 deletions
diff --git a/lib/feedmapper.php b/lib/feedmapper.php
index c5f01f8d2..a8292cd39 100644
--- a/lib/feedmapper.php
+++ b/lib/feedmapper.php
@@ -39,15 +39,24 @@ class OC_News_FeedMapper {
 	 * @returns
 	 */
 	public function findAll(){
-		$stmt = OCP\DB::prepare('SELECT * FROM ' . self::tableName . ' WHERE user_id = ?');
-		$result = $stmt->execute(array($this->userid));
+		$query = 'SELECT * FROM ' . self::tableName;
+		$params = array();
+		if( $this->userid ){
+			$query = $query.' WHERE user_id = ?';
+			$params[] = $this->userid;
+		}
+
+		$stmt = OCP\DB::prepare( $query );
+		$result = $stmt->execute( $params );
 		$feeds = array();
 		while ($row = $result->fetchRow()) {
 			$url = $row['url'];
 			$id = $row['id'];
 			$folderid = $row['folder_id'];
-			$feeds[] = array("url" => $url, "id" => $id, "folderid" => $folderid);
+			$userid = $row['user_id'];
+			$feeds[] = array("url" => $url, "id" => $id, "folderid" => $folderid, 'userid' => $userid );
 		}
+
 		return $feeds;
 	}
 
@@ -230,4 +239,4 @@ class OC_News_FeedMapper {
 
 		return true;
 	}
-}
-\ No newline at end of file
+}