Merge branch '5.3'

diff --git a/wcfsetup/install/files/lib/system/WCF.class.php b/wcfsetup/install/files/lib/system/WCF.class.php
index 768be8e23969a04575f29f249f59d5870f7233bb..ba5c2abd8d66d452e325c63423f917de65569c7c 100644 (file)
--- 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 c174d9fe52b12ce6d4d9dc3c98d96358399170bf..91c39bfea6bb8b272176c043a5becba59b3111ef 100644 (file)
--- 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;