From: Marcel Werk <burntime@woltlab.com>
Date: Sun, 29 Nov 2015 17:21:20 +0000 (+0100)
Subject: Merge branch 'next-lantia' of github.com:WoltLab/WCF into next-lantia
X-Git-Tag: 3.0.0_Beta_1~2030^2~224^2
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=ec3ca729d85f5f7f95221478e468e9f55f2a16c5;p=GitHub%2FWoltLab%2FWCF.git

Merge branch 'next-lantia' of github.com:WoltLab/WCF into next-lantia
---

ec3ca729d85f5f7f95221478e468e9f55f2a16c5
diff --cc wcfsetup/install/files/lib/data/page/PageEditor.class.php
index 999496b163,d6ab4b4076..3893d31d57
--- a/wcfsetup/install/files/lib/data/page/PageEditor.class.php
+++ b/wcfsetup/install/files/lib/data/page/PageEditor.class.php
@@@ -14,7 -14,7 +14,7 @@@ use wcf\data\DatabaseObjectEditor
   */
  class PageEditor extends DatabaseObjectEditor {
  	/**
 -	 * @see	\wcf\data\DatabaseObjectDecorator::$baseClass
 +	 * @inheritDoc
  	 */
- 	protected static $baseClass = 'wcf\data\page\Page';
+ 	protected static $baseClass = Page::class;
  }