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

1 files changed, 3 insertions, 2 deletions

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';
 	}