From 52439f61fefc296f4e543621a83e51c7b7ea5986 Mon Sep 17 00:00:00 2001 From: Marcel Werk Date: Wed, 7 Apr 2021 12:01:50 +0200 Subject: [PATCH] Merge branch '5.3' --- wcfsetup/install/files/lib/system/WCF.class.php | 2 +- .../lib/system/box/RecentActivityListBoxController.class.php | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/wcfsetup/install/files/lib/system/WCF.class.php b/wcfsetup/install/files/lib/system/WCF.class.php index 768be8e239..ba5c2abd8d 100644 --- a/wcfsetup/install/files/lib/system/WCF.class.php +++ b/wcfsetup/install/files/lib/system/WCF.class.php @@ -284,7 +284,7 @@ class WCF /** * Calls the show method on the given exception. * - * @param \Exception $e + * @param \Throwable $e */ final public static function handleException($e) { diff --git a/wcfsetup/install/files/lib/system/box/RecentActivityListBoxController.class.php b/wcfsetup/install/files/lib/system/box/RecentActivityListBoxController.class.php index c174d9fe52..91c39bfea6 100644 --- a/wcfsetup/install/files/lib/system/box/RecentActivityListBoxController.class.php +++ b/wcfsetup/install/files/lib/system/box/RecentActivityListBoxController.class.php @@ -218,6 +218,11 @@ class RecentActivityListBoxController extends AbstractDatabaseObjectListBoxContr 'user_activity_event.userID IN (?)', [WCF::getUserProfileHandler()->getFollowingUsers()] ); + } elseif (!empty(UserProfileHandler::getInstance()->getIgnoredUsers())) { + $this->objectList->getConditionBuilder()->add( + "user_activity_event.userID NOT IN (?)", + [UserProfileHandler::getInstance()->getIgnoredUsers()] + ); } return $this->objectList; -- 2.20.1