From: Tim Düsterhus <duesterhus@woltlab.com>
Date: Thu, 30 Jul 2015 13:07:19 +0000 (+0200)
Subject: Merge branch '2.0'
X-Git-Tag: 2.1.7~52
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d6591200f510351826954a5cef5e33f99728b5a9;p=GitHub%2FWoltLab%2FWCF.git

Merge branch '2.0'
---

d6591200f510351826954a5cef5e33f99728b5a9
diff --cc wcfsetup/install/files/lib/system/package/plugin/BBCodePackageInstallationPlugin.class.php
index 2fe9d25a94,1d7694c2f4..169725bd85
--- a/wcfsetup/install/files/lib/system/package/plugin/BBCodePackageInstallationPlugin.class.php
+++ b/wcfsetup/install/files/lib/system/package/plugin/BBCodePackageInstallationPlugin.class.php
@@@ -2,9 -2,9 +2,10 @@@
  namespace wcf\system\package\plugin;
  use wcf\data\bbcode\attribute\BBCodeAttributeEditor;
  use wcf\data\package\PackageCache;
+ use wcf\system\database\util\PreparedStatementConditionBuilder;
  use wcf\system\exception\SystemException;
  use wcf\system\WCF;
 +use wcf\util\StringUtil;
  
  /**
   * Installs, updates and deletes bbcodes.