From: Marcel Werk <burntime@woltlab.com>
Date: Tue, 21 Jun 2016 12:15:20 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/next' into next
X-Git-Tag: 3.0.0_Beta_1~1384
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=9e5be318176429e2001b98a18d75347570135745;p=GitHub%2FWoltLab%2FWCF.git

Merge remote-tracking branch 'origin/next' into next

# Conflicts:
#	wcfsetup/install/files/lib/page/AbstractArticlePage.class.php
---

9e5be318176429e2001b98a18d75347570135745
diff --cc wcfsetup/install/files/lib/page/AbstractArticlePage.class.php
index b7a62d2ddf,ea9afa430a..cb73d2f033
--- a/wcfsetup/install/files/lib/page/AbstractArticlePage.class.php
+++ b/wcfsetup/install/files/lib/page/AbstractArticlePage.class.php
@@@ -1,11 -1,9 +1,11 @@@
  <?php
  namespace wcf\page;
- use wcf\data\article\AccessibleArticleList;
 +use wcf\data\article\category\ArticleCategory;
  use wcf\data\article\content\ViewableArticleContent;
+ use wcf\data\article\AccessibleArticleList;
  use wcf\data\article\ArticleEditor;
  use wcf\data\article\ViewableArticle;
 +use wcf\data\tag\Tag;
  use wcf\system\database\util\PreparedStatementConditionBuilder;
  use wcf\system\exception\IllegalLinkException;
  use wcf\system\exception\PermissionDeniedException;