summaryrefslogtreecommitdiffstats
path: root/service
diff options
context:
space:
mode:
authorBernhard Posselt <dev@bernhard-posselt.com>2014-06-25 11:22:08 +0200
committerBernhard Posselt <dev@bernhard-posselt.com>2014-06-25 11:22:08 +0200
commit06367d8b81407fc2948e0f666b38f4de2dffbd89 (patch)
treed5cfb74e70560f3abce5aeccf8994dcbe2829e24 /service
parent60c4dfbd9661b93bce14a6a429a3f23d19b5327c (diff)
style fixes
Diffstat (limited to 'service')
-rw-r--r--service/feedservice.php5
-rw-r--r--service/itemservice.php1
2 files changed, 4 insertions, 2 deletions
diff --git a/service/feedservice.php b/service/feedservice.php
index 08b2d1d2f..cc4c8770d 100644
--- a/service/feedservice.php
+++ b/service/feedservice.php
@@ -181,7 +181,7 @@ class FeedService extends Service {
$existingFeed = $this->feedMapper->find($feedId, $userId);
if($existingFeed->getPreventUpdate() === true) {
- return;
+ return $existingFeed;
}
try {
@@ -223,6 +223,7 @@ class FeedService extends Service {
} catch (DoesNotExistException $ex){
throw new ServiceNotFoundException('Feed does not exist');
}
+
}
@@ -317,6 +318,8 @@ class FeedService extends Service {
if($createdFeed) {
return $this->feedMapper->findByUrlHash($urlHash, $userId);
}
+
+ return null;
}
diff --git a/service/itemservice.php b/service/itemservice.php
index b34dadad8..b2ab80bc5 100644
--- a/service/itemservice.php
+++ b/service/itemservice.php
@@ -15,7 +15,6 @@ namespace OCA\News\Service;
use \OCP\AppFramework\Db\DoesNotExistException;
-use \OCA\News\Db\Item;
use \OCA\News\Db\ItemMapper;
use \OCA\News\Db\StatusFlag;
use \OCA\News\Db\FeedType;