Revert "Add a user parameter to check whether the user is allowed to moderate this...

This reverts commit 8005d38adb57834864e7c7736193568d80d83813.

diff --git a/wcfsetup/install/files/lib/system/comment/manager/AbstractCommentManager.class.php b/wcfsetup/install/files/lib/system/comment/manager/AbstractCommentManager.class.php
index 7a1a8d016360d32c44360996c8f749d32f9f338c..33c2ac44667f1070d8480edd2dd9d4e38f4db5fa 100644 (file)
--- a/wcfsetup/install/files/lib/system/comment/manager/AbstractCommentManager.class.php
+++ b/wcfsetup/install/files/lib/system/comment/manager/AbstractCommentManager.class.php
@@ -5,7 +5,6 @@ namespace wcf\system\comment\manager;
 use wcf\data\comment\Comment;
 use wcf\data\comment\response\CommentResponse;
 use wcf\data\DatabaseObjectDecorator;
-use wcf\data\user\UserProfile;
 use wcf\system\bbcode\BBCodeHandler;
 use wcf\system\SingletonFactory;
 use wcf\system\WCF;
@@ -154,14 +153,10 @@ abstract class AbstractCommentManager extends SingletonFactory implements IComme
     }
 
     /**
-     * @param UserProfile|null $user
      * @inheritDoc
      */
-    public function canModerate($objectTypeID, $objectID, ?UserProfile $user = null)
+    public function canModerate($objectTypeID, $objectID)
     {
-        if ($user !== null) {
-            return $user->getPermission($this->permissionCanModerate) ? true : false;
-        }
         return WCF::getSession()->getPermission($this->permissionCanModerate) ? true : false;
     }
 

diff --git a/wcfsetup/install/files/lib/system/comment/manager/ICommentManager.class.php b/wcfsetup/install/files/lib/system/comment/manager/ICommentManager.class.php
index 91b502e11c01aef50aa350c684aaa86e08a69f71..90bb0602d2f3cbcb199ceb9c3915f115a00e54f8 100644 (file)
--- a/wcfsetup/install/files/lib/system/comment/manager/ICommentManager.class.php
+++ b/wcfsetup/install/files/lib/system/comment/manager/ICommentManager.class.php
@@ -4,7 +4,6 @@ namespace wcf\system\comment\manager;
 
 use wcf\data\comment\Comment;
 use wcf\data\comment\response\CommentResponse;
-use wcf\data\user\UserProfile;
 
 /**
  * Default interface for comment managers.
@@ -63,15 +62,14 @@ interface ICommentManager
     public function canDeleteResponse(CommentResponse $response);
 
     /**
-     * Returns true if the current or given user may moderated content identified by
+     * Returns true if the current user may moderated content identified by
      * object type id and object id.
      *
      * @param int $objectTypeID
      * @param int $objectID
-     * @param UserProfile|null $user
      * @return  bool
      */
-    public function canModerate($objectTypeID, $objectID, ?UserProfile $user = null);
+    public function canModerate($objectTypeID, $objectID);
 
     /**
      * Returns the amount of comments per page.