From: Matthias Schmidt Date: Sat, 22 Oct 2016 07:07:22 +0000 (+0200) Subject: Merge branch '2.1' X-Git-Tag: 3.0.0_Beta_4~43 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=27bcf252d845b0dfb7f8dc4444c52939b143289e;p=GitHub%2FWoltLab%2FWCF.git Merge branch '2.1' # Conflicts: # com.woltlab.wcf/package.xml # wcfsetup/install/files/lib/form/AbstractModerationForm.class.php # wcfsetup/install/files/lib/system/WCF.class.php --- 27bcf252d845b0dfb7f8dc4444c52939b143289e diff --cc wcfsetup/install/files/lib/form/AbstractModerationForm.class.php index f467f0043b,a23736ab06..b2bdd5daef --- a/wcfsetup/install/files/lib/form/AbstractModerationForm.class.php +++ b/wcfsetup/install/files/lib/form/AbstractModerationForm.class.php @@@ -8,7 -7,9 +8,8 @@@ use wcf\system\comment\CommentHandler use wcf\system\event\EventHandler; use wcf\system\exception\IllegalLinkException; use wcf\system\exception\PermissionDeniedException; + use wcf\system\moderation\queue\ModerationQueueManager; -use wcf\system\request\LinkHandler; -use wcf\system\user\collapsible\content\UserCollapsibleContentHandler; +use wcf\system\page\PageLocationManager; use wcf\system\WCF; /**