fix a bug that would not display items of feeds without folders

2 files changed, 8 insertions, 2 deletions

diff --git a/db/feedmapper.php b/db/feedmapper.php
index f8c222298..99271f494 100644
--- a/db/feedmapper.php
+++ b/db/feedmapper.php
@@ -82,6 +82,8 @@ class FeedMapper extends Mapper implements IMapper {
 	public function findAllFromUser($userId){
 		$sql = 'SELECT `feeds`.*, COUNT(`items`.`id`) AS `unread_count` ' .
 			'FROM `*PREFIX*news_feeds` `feeds` ' .
+			'LEFT OUTER JOIN `*PREFIX*news_folders` `folders` '.
+				'ON `feeds`.`folder_id` = `folders`.`id` ' .
 			'LEFT JOIN `*PREFIX*news_items` `items` ' .
 				'ON `feeds`.`id` = `items`.`feed_id` ' .
 				// WARNING: this is a desperate attempt at making this query work
@@ -91,6 +93,9 @@ class FeedMapper extends Mapper implements IMapper {
 				'AND (`items`.`status` & ' . StatusFlag::UNREAD . ') = ' .
 				StatusFlag::UNREAD . ' ' .
 			'WHERE `feeds`.`user_id` = ? ' .
+			'AND (`feeds`.`folder_id` = 0 ' .
+				'OR `folders`.`deleted_at` = 0' .
+			')' .
 			'AND `feeds`.`deleted_at` = 0 ' .
 			'GROUP BY `feeds`.`id`, `feeds`.`user_id`, `feeds`.`url_hash`,'.
 				'`feeds`.`url`, `feeds`.`title`, `feeds`.`link`,'.
diff --git a/db/itemmapper.php b/db/itemmapper.php
index cd46678b7..0f94b4301 100644
--- a/db/itemmapper.php
+++ b/db/itemmapper.php
@@ -59,9 +59,10 @@ class ItemMapper extends Mapper implements IMapper {
 				'AND `feeds`.`deleted_at` = 0 ' .
 				'AND `feeds`.`user_id` = ? ' . 
 				$prependTo .
-			'JOIN `*PREFIX*news_folders` `folders` ' .
+			'LEFT OUTER JOIN `*PREFIX*news_folders` `folders` ' .
 				'ON `folders`.`id` = `feeds`.`folder_id` ' .
-				'AND `folders`.`deleted_at` = 0 ' . 
+			'WHERE `feeds`.`folder_id` = 0 ' .
+				'OR `folders`.`deleted_at` = 0 ' . 
 			'ORDER BY `items`.`id` DESC';
 	}