1 files changed, 9 insertions, 6 deletions
diff --git a/lib/foldermapper.php b/lib/foldermapper.php
index 19d7e56a5..b875f1369 100644
--- a/lib/foldermapper.php
+++ b/lib/foldermapper.php
@@ -34,6 +34,15 @@ class OC_News_FolderMapper {
 	 */
 	public function populate($name, $id){
 		$root = new OC_News_Folder($name, $id);
+
+		// first add child feeds
+		$feedmapper = new OC_News_FeedMapper();
+		$feeds = $feedmapper->findByFolderId($id);
+		foreach ($feeds as $feed){
+			$root->addChild($feed);
+		}
+
+		// and second child folders
 		$stmt = OCP\DB::prepare('SELECT *
 					FROM ' . self::tableName .
 					' WHERE user_id = ? AND parent_id = ?');
@@ -44,12 +53,6 @@ class OC_News_FolderMapper {
 			$root->addChild($child);
 		}
 
-		$feedmapper = new OC_News_FeedMapper();
-		$feeds = $feedmapper->findByFolderId($id);
-		foreach ($feeds as $feed){
-			$root->addChild($feed);
-		}
-
 		return $root;
 	}