From efcc2e87ab860c50f7904ac8e98914589a9c097a Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Tue, 31 Mar 2015 17:35:04 +0200 Subject: [PATCH] Adjust by/self filter aswell and fix tests --- apps/files/lib/activity.php | 2 +- apps/files/tests/activitytest.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/files/lib/activity.php b/apps/files/lib/activity.php index 007f9a1dda4..fff49ea4ea5 100644 --- a/apps/files/lib/activity.php +++ b/apps/files/lib/activity.php @@ -318,7 +318,7 @@ class Activity implements IExtension { } // Display actions from favorites only - if ($filter === self::FILTER_FAVORITES || $filter === 'all' && $this->userSettingFavoritesOnly($user)) { + if ($filter === self::FILTER_FAVORITES || in_array($filter, ['all', 'by', 'self']) && $this->userSettingFavoritesOnly($user)) { try { $favorites = $this->helper->getFavoriteFilePaths($user); } catch (\RuntimeException $e) { diff --git a/apps/files/tests/activitytest.php b/apps/files/tests/activitytest.php index 24240a03771..b8766f95224 100644 --- a/apps/files/tests/activitytest.php +++ b/apps/files/tests/activitytest.php @@ -234,7 +234,7 @@ class ActivityTest extends TestCase { 'items' => [], 'folders' => [], ], - ' CASE WHEN `app` = ? THEN (`type` <> ? OR `type` <> ?) ELSE `app` <> ? END ', + ' CASE WHEN `app` = ? THEN ((`type` <> ? AND `type` <> ?)) ELSE `app` <> ? END ', ['files', Activity::TYPE_SHARE_CREATED, Activity::TYPE_SHARE_CHANGED, 'files'] ], [ @@ -242,7 +242,7 @@ class ActivityTest extends TestCase { 'items' => ['file.txt', 'folder'], 'folders' => ['folder'], ], - ' CASE WHEN `app` = ? THEN (`type` <> ? OR `type` <> ? OR `file` = ? OR `file` = ? OR `file` LIKE ?) ELSE `app` <> ? END ', + ' CASE WHEN `app` = ? THEN ((`type` <> ? AND `type` <> ?) OR `file` = ? OR `file` = ? OR `file` LIKE ?) ELSE `app` <> ? END ', ['files', Activity::TYPE_SHARE_CREATED, Activity::TYPE_SHARE_CHANGED, 'file.txt', 'folder', 'folder/%', 'files'] ], ]; -- 2.39.5