summaryrefslogtreecommitdiffstats
path: root/apps/files/lib
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@owncloud.com>2015-03-31 17:35:04 +0200
committerJoas Schilling <nickvergessen@owncloud.com>2015-03-31 17:35:04 +0200
commitefcc2e87ab860c50f7904ac8e98914589a9c097a (patch)
tree9f4ac294a0f88d96f1a469a8a9b0f3c9e049dab6 /apps/files/lib
parent116b257b4d1e9b986fc2d9a438b5c2cc92e3717f (diff)
downloadnextcloud-server-efcc2e87ab860c50f7904ac8e98914589a9c097a.tar.gz
nextcloud-server-efcc2e87ab860c50f7904ac8e98914589a9c097a.zip
Adjust by/self filter aswell and fix tests
Diffstat (limited to 'apps/files/lib')
-rw-r--r--apps/files/lib/activity.php2
1 files changed, 1 insertions, 1 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) {