From: Joas Schilling <nickvergessen@owncloud.com>
Date: Tue, 31 Mar 2015 15:35:04 +0000 (+0200)
Subject: Adjust by/self filter aswell and fix tests
X-Git-Tag: v8.1.0alpha1~61^2~1
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=efcc2e87ab860c50f7904ac8e98914589a9c097a;p=nextcloud-server.git

Adjust by/self filter aswell and fix tests
---

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']
 			],
 		];