small fixes on model

2 files changed, 14 insertions, 2 deletions

diff --git a/lib/foldermapper.php b/lib/foldermapper.php
index 33a14a0c4..54ed1e8aa 100644
--- a/lib/foldermapper.php
+++ b/lib/foldermapper.php
@@ -68,7 +68,7 @@ class FolderMapper {
 		while( $row = $result->fetchRow()){
 			$folderid = $row['id'];
 			$folder = new Folder($row['name'], $folderid);
-			$children = self::childrenOf($folderid);
+			$children = self::childrenOfWithFeeds($folderid);
 			$folder->addChildren($children);
 			$collectionlist[] = $folder;
 		}
@@ -127,11 +127,21 @@ class FolderMapper {
 		return $folderid;
 	}
 
+	/**
+	 * @brief Delete the folder and all its feeds from the database
+	 * @param folder the folder to be deleted (an instance of OCA\News\Folder)
+	 * @returns true if the folder has been deleted, false if an error occurred
+	 */
 	public function delete(Folder $folder){
 		$folderid = $folder->getId();
 		return deleteById(folderid);
 	}
 
+	/**
+	 * @brief Delete the folder and all its feeds from the database
+	 * @param folder the folder to be deleted (an instance of OCA\News\Folder)
+	 * @returns true if the folder has been deleted, false if an error occurred
+	 */
 	public function deleteById($folderid){
 		if ($folderid == null){
 			return false;
diff --git a/lib/utils.php b/lib/utils.php
index 5def91e4a..7ad9f1929 100644
--- a/lib/utils.php
+++ b/lib/utils.php
@@ -46,7 +46,9 @@ class Utils {
 				$itemBody = $spitem->get_content();
 				$itemAuthor = $spitem->get_author();
 				$item = new Item($itemUrl, $itemTitle, $itemGUID, $itemBody);
-				$item->setAuthor($itemAuthor->get_name());
+				if ($itemAuthor !== null) {
+					$item->setAuthor($itemAuthor->get_name());
+				}
 				$items[] = $item;
 			}
 		}