diff options
author | Bernhard Posselt <nukeawhale@gmail.com> | 2013-03-27 18:21:30 +0100 |
---|---|---|
committer | Bernhard Posselt <nukeawhale@gmail.com> | 2013-03-27 18:21:30 +0100 |
commit | bf93d491cefd19fe8ab339725d4c7ce627b6308b (patch) | |
tree | 314b208df88968de1e97b13bf0be285d43252574 | |
parent | d97e2b1f0e26b113f870a09c5cc3ab384f1c1d94 (diff) |
correctly save last viewed feed
-rw-r--r-- | controller/feedcontroller.php | 4 | ||||
-rw-r--r-- | controller/itemcontroller.php | 4 | ||||
-rw-r--r-- | tests/controller/FeedControllerTest.php | 4 | ||||
-rw-r--r-- | tests/controller/ItemControllerTest.php | 6 |
4 files changed, 8 insertions, 10 deletions
diff --git a/controller/feedcontroller.php b/controller/feedcontroller.php index f5c060562..c542ea1d8 100644 --- a/controller/feedcontroller.php +++ b/controller/feedcontroller.php @@ -72,8 +72,8 @@ class FeedController extends Controller { */ public function active(){ $userId = $this->api->getUserId(); - $feedId = (int) $this->api->getUserValue($userId, 'lastViewedFeedId'); - $feedType = $this->api->getUserValue($userId, 'lastViewedFeedType'); + $feedId = (int) $this->api->getUserValue('lastViewedFeedId'); + $feedType = $this->api->getUserValue('lastViewedFeedType'); // cast from null to int is 0 if($feedType !== null){ diff --git a/controller/itemcontroller.php b/controller/itemcontroller.php index 3fa422eab..23509fec2 100644 --- a/controller/itemcontroller.php +++ b/controller/itemcontroller.php @@ -55,8 +55,8 @@ class ItemController extends Controller { $type = (int) $this->params('type'); $id = (int) $this->params('id'); - $this->api->setUserValue($userId, 'lastViewedFeedId', $id); - $this->api->setUserValue($userId, 'lastViewedFeedType', $type); + $this->api->setUserValue('lastViewedFeedId', $id); + $this->api->setUserValue('lastViewedFeedType', $type); if($limit !== null){ $offset = (int) $this->params('offset', 0); diff --git a/tests/controller/FeedControllerTest.php b/tests/controller/FeedControllerTest.php index 4ccb7bed6..d74811a07 100644 --- a/tests/controller/FeedControllerTest.php +++ b/tests/controller/FeedControllerTest.php @@ -139,11 +139,11 @@ class FeedControllerTest extends ControllerTestUtility { ->will($this->returnValue($this->user)); $this->api->expects($this->at(1)) ->method('getUserValue') - ->with($this->equalTo($this->user), $this->equalTo('lastViewedFeedId')) + ->with($this->equalTo('lastViewedFeedId')) ->will($this->returnValue($id)); $this->api->expects($this->at(2)) ->method('getUserValue') - ->with($this->equalTo($this->user), $this->equalTo('lastViewedFeedType')) + ->with($this->equalTo('lastViewedFeedType')) ->will($this->returnValue($type)); } diff --git a/tests/controller/ItemControllerTest.php b/tests/controller/ItemControllerTest.php index 6ec73f8b8..ff166128d 100644 --- a/tests/controller/ItemControllerTest.php +++ b/tests/controller/ItemControllerTest.php @@ -237,13 +237,11 @@ class ItemControllerTest extends ControllerTestUtility { ->will($this->returnValue($this->user)); $this->api->expects($this->at(2)) ->method('setUserValue') - ->with($this->equalTo($this->user), - $this->equalTo('lastViewedFeedId'), + ->with($this->equalTo('lastViewedFeedId'), $this->equalTo($id)); $this->api->expects($this->at(3)) ->method('setUserValue') - ->with($this->equalTo($this->user), - $this->equalTo('lastViewedFeedType'), + ->with($this->equalTo('lastViewedFeedType'), $this->equalTo($type)); } |