Merge remote-tracking branch 'origin/6.0'

[GitHub/WoltLab/WCF.git] / wcfsetup / install / files / lib / data / user / ignore / UserIgnoreAction.class.php

diff --git a/wcfsetup/install/files/lib/data/user/ignore/UserIgnoreAction.class.php b/wcfsetup/install/files/lib/data/user/ignore/UserIgnoreAction.class.php
index a37535490d27c9a3ac4d6cffaae308c87375bbae..81595ce2c0ab2e49f3b101f17597ed0e0aa4f748 100644 (file)
--- a/wcfsetup/install/files/lib/data/user/ignore/UserIgnoreAction.class.php
+++ b/wcfsetup/install/files/lib/data/user/ignore/UserIgnoreAction.class.php
@@ -145,6 +145,7 @@ class UserIgnoreAction extends AbstractDatabaseObjectAction
             $ignoreEditor->delete();
 
             UserStorageHandler::getInstance()->reset([WCF::getUser()->userID], 'ignoredUserIDs');
+            UserStorageHandler::getInstance()->reset([$this->parameters['data']['userID']], 'ignoredByUserIDs');
         }
 
         return ['isIgnoredUser' => 0];
@@ -296,10 +297,15 @@ class UserIgnoreAction extends AbstractDatabaseObjectAction
      */
     public function delete()
     {
+        $userIDs = \array_map(function ($ignore) {
+            return $ignore->ignoreUserID;
+        }, $this->getObjects());
+
         $returnValues = parent::delete();
 
         // reset storage
         UserStorageHandler::getInstance()->reset([WCF::getUser()->userID], 'ignoredUserIDs');
+        UserStorageHandler::getInstance()->reset($userIDs, 'ignoredByUserIDs');
 
         return $returnValues;
     }