From: Tim Düsterhus <duesterhus@woltlab.com>
Date: Tue, 26 Feb 2019 15:06:24 +0000 (+0100)
Subject: Merge branch 'master' into next
X-Git-Tag: 5.2.0_Alpha_1~258
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=96c976a9cfc2d2e2b5ba5918b3dbfe2db538f4d6;p=GitHub%2FWoltLab%2FWCF.git

Merge branch 'master' into next
---

96c976a9cfc2d2e2b5ba5918b3dbfe2db538f4d6
diff --cc wcfsetup/install/files/lib/system/tagging/TagEngine.class.php
index 8aad0fe646,7d56c0e211..6a1c5b5f0f
--- a/wcfsetup/install/files/lib/system/tagging/TagEngine.class.php
+++ b/wcfsetup/install/files/lib/system/tagging/TagEngine.class.php
@@@ -3,12 -3,11 +3,13 @@@ namespace wcf\system\tagging
  use wcf\data\object\type\ObjectTypeCache;
  use wcf\data\tag\Tag;
  use wcf\data\tag\TagAction;
 +use wcf\data\tag\TagList;
  use wcf\system\database\util\PreparedStatementConditionBuilder;
  use wcf\system\exception\InvalidObjectTypeException;
 +use wcf\system\language\LanguageFactory;
  use wcf\system\SingletonFactory;
  use wcf\system\WCF;
+ use wcf\util\ArrayUtil;
  
  /**
   * Manages the tagging of objects.