From: Marcel Werk Date: Sat, 2 Apr 2016 19:57:25 +0000 (+0200) Subject: Merge remote-tracking branch 'origin/next' into next X-Git-Tag: 3.0.0_Beta_1~1986 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=e8d1a8922217704d4a8cb26962600698232ab1cd;p=GitHub%2FWoltLab%2FWCF.git Merge remote-tracking branch 'origin/next' into next # Conflicts: # com.woltlab.wcf/page.xml --- e8d1a8922217704d4a8cb26962600698232ab1cd diff --cc com.woltlab.wcf/page.xml index 931f268351,97fd8fb1a3..d0e4b8d163 --- a/com.woltlab.wcf/page.xml +++ b/com.woltlab.wcf/page.xml @@@ -44,8 -39,7 +44,8 @@@ module_team_page + system - wcf\page\UserSearchForm + wcf\form\UserSearchForm com.woltlab.wcf.MembersList @@@ -53,9 -47,168 +53,197 @@@ module_members_list + ++ system + wcf\form\AccountManagementForm + + + + ++ system + wcf\form\AvatarEditForm + + + + ++ system + wcf\form\DisclaimerForm + + + + ++ system + wcf\form\EmailActivationForm + + + + ++ system + wcf\form\EmailNewActivationCodeForm + + + + ++ system + wcf\form\LoginForm + + + + ++ system + wcf\form\LostPasswordForm + + + + ++ system + wcf\form\MailForm + + + + ++ system + wcf\form\NewPasswordForm + + + + ++ system + wcf\form\NotificationSettingsForm + + + + ++ system + wcf\form\RegisterActivationForm + + + + ++ system + wcf\form\RegisterForm + + + + ++ system + wcf\form\RegisterNewActivationCodeForm + + + + ++ system + wcf\form\SearchForm + + + + ++ system + wcf\form\SettingsForm + + + + ++ system + wcf\form\SignatureEditForm + + + module_user_signature + + ++ system + wcf\page\DeletedContentListPage + + + mod.general.canUseModeration + + ++ system + wcf\page\EditHistoryPage + + + module_edit_history + 1 + + ++ system + wcf\page\FollowingPage + + + + ++ system + wcf\page\IgnoredUsersPage + + + + ++ system + wcf\page\ModerationListPage + + + mod.general.canUseModeration + + ++ system + wcf\form\ModerationActivationForm + + + com.woltlab.wcf.ModerationList + mod.general.canUseModeration + 1 + + ++ system + wcf\form\ModerationReportForm + + + com.woltlab.wcf.ModerationList + mod.general.canUseModeration + 1 + + ++ system + wcf\page\NotificationListPage + + + + ++ system + wcf\page\PaidSubscriptionListPage + + + module_paid_subscription + + ++ system + wcf\page\SearchResultPage + + + com.woltlab.wcf.Search + 1 + + ++ system + wcf\page\TaggedPage + + + user.tag.canViewTag + 1 + + ++ system + wcf\page\UserPage + wcf\system\page\handler\UserPageHandler + + + com.woltlab.wcf.MembersList + 1 + + + text Cookie Policy Cookie-Richtlinie diff --cc wcfsetup/install/files/lib/acp/form/PageAddForm.class.php index 7c2e31ca7c,5cece48518..d021ca7033 --- a/wcfsetup/install/files/lib/acp/form/PageAddForm.class.php +++ b/wcfsetup/install/files/lib/acp/form/PageAddForm.class.php @@@ -42,15 -42,9 +42,15 @@@ class PageAddForm extends AbstractForm */ public $isMultilingual = 0; + /** + * page type + * @var string + */ + public $pageType = ''; + /** * parent page id - * @var integer + * @var integer */ public $parentPageID = 0; @@@ -90,15 -84,9 +90,15 @@@ */ public $customURL = []; + /** + * page controller + * @var string + */ + public $controller = ''; + /** * page titles - * @var string[] + * @var string[] */ public $title = [];