From: Alexander Ebert <ebert@woltlab.com>
Date: Wed, 20 Dec 2017 22:38:50 +0000 (+0100)
Subject: Merge remote-tracking branch 'refs/remotes/origin/3.0'
X-Git-Tag: 3.1.0_Beta_5~21
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=cce7bf4e05c9f9e862b3fa803b65c2169c34e8db;p=GitHub%2FWoltLab%2FWCF.git

Merge remote-tracking branch 'refs/remotes/origin/3.0'
---

cce7bf4e05c9f9e862b3fa803b65c2169c34e8db
diff --cc wcfsetup/install/files/lib/system/package/plugin/PagePackageInstallationPlugin.class.php
index cafba51e56,af113255d4..c9aec69530
--- a/wcfsetup/install/files/lib/system/package/plugin/PagePackageInstallationPlugin.class.php
+++ b/wcfsetup/install/files/lib/system/package/plugin/PagePackageInstallationPlugin.class.php
@@@ -2,8 -2,8 +2,9 @@@
  namespace wcf\system\package\plugin;
  use wcf\data\package\PackageCache;
  use wcf\data\page\Page;
+ use wcf\data\page\PageAction;
  use wcf\data\page\PageEditor;
 +use wcf\system\devtools\pip\IIdempotentPackageInstallationPlugin;
  use wcf\system\exception\SystemException;
  use wcf\system\language\LanguageFactory;
  use wcf\system\request\RouteHandler;