From 3b425b0a46ae89e9ef0127b35563572238a1dc1c Mon Sep 17 00:00:00 2001 From: Bernhard Posselt Date: Tue, 16 Apr 2013 16:08:55 +0200 Subject: dont care if starred items are read or unread, always show them --- db/statusflag.php | 2 +- tests/unit/businesslayer/StatusFlagTest.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/db/statusflag.php b/db/statusflag.php index 2b96564fc..98b99529f 100644 --- a/db/statusflag.php +++ b/db/statusflag.php @@ -37,7 +37,7 @@ class StatusFlag { */ public function typeToStatus($type, $showAll){ if($type === FeedType::STARRED){ - $status = self::STARRED; + return self::STARRED; } else { $status = 0; } diff --git a/tests/unit/businesslayer/StatusFlagTest.php b/tests/unit/businesslayer/StatusFlagTest.php index 12e78d8cc..1e2d0b622 100644 --- a/tests/unit/businesslayer/StatusFlagTest.php +++ b/tests/unit/businesslayer/StatusFlagTest.php @@ -41,7 +41,7 @@ class StatusFlagTest extends TestUtility { public function testTypeToStatusUnreadStarred(){ - $expected = StatusFlag::UNREAD | StatusFlag::STARRED; + $expected = StatusFlag::STARRED; $status = $this->statusFlag->typeToStatus(FeedType::STARRED, false); $this->assertEquals($expected, $status); @@ -57,7 +57,7 @@ class StatusFlagTest extends TestUtility { public function testTypeToStatusReadStarred(){ - $expected = (~StatusFlag::UNREAD) & StatusFlag::STARRED; + $expected = StatusFlag::STARRED; $status = $this->statusFlag->typeToStatus(FeedType::STARRED, true); $this->assertEquals($expected, $status); -- cgit v1.2.3