diff options
| author | Bernhard Posselt <dev@bernhard-posselt.com> | 2014-05-14 01:04:57 +0200 |
|---|---|---|
| committer | Bernhard Posselt <dev@bernhard-posselt.com> | 2014-05-14 01:04:57 +0200 |
| commit | 2bfa9f22b7d97dcdbda5992ad603d9d10482b49f (patch) | |
| tree | 6d23098988a6a7ab0b99b4baf1b6ad13b9a7be25 /controller | |
| parent | 7faa40dc59738fc4b5bb9dd2121e433e2301c36b (diff) | |
fix unittests
Diffstat (limited to 'controller')
| -rw-r--r-- | controller/feedcontroller.php | 4 | ||||
| -rw-r--r-- | controller/folderapicontroller.php | 4 | ||||
| -rw-r--r-- | controller/itemapicontroller.php | 2 | ||||
| -rw-r--r-- | controller/pagecontroller.php | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/controller/feedcontroller.php b/controller/feedcontroller.php index 5489f555c..eb172debb 100644 --- a/controller/feedcontroller.php +++ b/controller/feedcontroller.php @@ -213,7 +213,7 @@ class FeedController extends Controller { * @param int $feedId * @param string $feedTitle */ - public function rename() { + public function rename($feedId, $feedTitle) { try { $this->feedBusinessLayer->rename($feedId, $feedTitle, $this->userId); } catch(BusinessLayerException $ex) { @@ -265,7 +265,7 @@ class FeedController extends Controller { * * @param int $feedId */ - public function restore(){ + public function restore($feedId){ try { $this->feedBusinessLayer->unmarkDeleted($feedId, $this->userId); } catch(BusinessLayerException $ex) { diff --git a/controller/folderapicontroller.php b/controller/folderapicontroller.php index bf78bdf72..274264ccc 100644 --- a/controller/folderapicontroller.php +++ b/controller/folderapicontroller.php @@ -66,7 +66,7 @@ class FolderApiController extends ApiController { public function create($name) { try { $this->folderBusinessLayer->purgeDeleted($this->userId, false); - $folder = $this->folderBusinessLayer->create($folderName, $this->userId); + $folder = $this->folderBusinessLayer->create($name, $this->userId); $this->registerSerializer(new EntityApiSerializer('folders')); return $folder; @@ -104,7 +104,7 @@ class FolderApiController extends ApiController { */ public function update($folderId, $name) { try { - $this->folderBusinessLayer->rename($folderId, $folderName, $this->userId); + $this->folderBusinessLayer->rename($folderId, $name, $this->userId); } catch(BusinessLayerValidationException $ex) { return $this->error($ex, Http::STATUS_UNPROCESSABLE_ENTITY); diff --git a/controller/itemapicontroller.php b/controller/itemapicontroller.php index 5ab728d55..9e4fb672c 100644 --- a/controller/itemapicontroller.php +++ b/controller/itemapicontroller.php @@ -52,7 +52,7 @@ class ItemApiController extends ApiController { $this->registerSerializer(new EntityApiSerializer('items')); return $this->itemBusinessLayer->findAll($id, $type, $batchSize, $offset, - $showAll, $this->userId); + $getRead, $this->userId); } diff --git a/controller/pagecontroller.php b/controller/pagecontroller.php index b621a8ae3..d60a24cea 100644 --- a/controller/pagecontroller.php +++ b/controller/pagecontroller.php @@ -55,7 +55,7 @@ class PageController extends Controller { 'showAll'); $compact = $this->settings->getUserValue($this->userId, $this->appName, 'compact'); - $language = $this->l10n->findLanguage(); + $language = $this->l10n->getLanguageCode(); return array( 'showAll' => $showAll === '1', |