From: Matthias Schmidt <gravatronics@live.com>
Date: Mon, 7 Jan 2019 17:21:26 +0000 (+0100)
Subject: Deprecate `controllerCustomURL` for page PIP
X-Git-Tag: 5.2.0_Alpha_1~365^2~25
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=367dae3425d4e09dbce72bf73e7fe20d12d15348;p=GitHub%2FWoltLab%2FWCF.git

Deprecate `controllerCustomURL` for page PIP

See #2545
---

diff --git a/wcfsetup/install/files/lib/system/package/plugin/PagePackageInstallationPlugin.class.php b/wcfsetup/install/files/lib/system/package/plugin/PagePackageInstallationPlugin.class.php
index ca1d4e74b5..6bfe3bc0ca 100644
--- a/wcfsetup/install/files/lib/system/package/plugin/PagePackageInstallationPlugin.class.php
+++ b/wcfsetup/install/files/lib/system/package/plugin/PagePackageInstallationPlugin.class.php
@@ -194,6 +194,7 @@ class PagePackageInstallationPlugin extends AbstractXMLPackageInstallationPlugin
 					$handler = $data['elements']['handler'];
 				}
 				
+				// @deprecated
 				if (!empty($data['elements']['controllerCustomURL'])) {
 					$controllerCustomURL = $data['elements']['controllerCustomURL'];
 					if ($controllerCustomURL && !RouteHandler::isValidCustomUrl($controllerCustomURL)) {
@@ -487,10 +488,6 @@ class PagePackageInstallationPlugin extends AbstractXMLPackageInstallationPlugin
 				->label('wcf.acp.pip.page.handler')
 				->implementedInterface(IMenuPageHandler::class),
 			
-			TextFormField::create('controllerCustomURL')
-				->label('wcf.acp.pip.page.controllerCustomURL')
-				->description('wcf.acp.pip.page.controllerCustomURL.description'),
-			
 			BooleanFormField::create('requireObjectID')
 				->label('wcf.acp.pip.page.requireObjectID')
 				->description('wcf.acp.pip.page.requireObjectID.description'),
@@ -655,7 +652,7 @@ class PagePackageInstallationPlugin extends AbstractXMLPackageInstallationPlugin
 		}
 		
 		$optionalElements = [
-			'controller', 'handler', 'controllerCustomURL', 'hasFixedParent',
+			'controller', 'handler', 'hasFixedParent',
 			'parent', 'options', 'permissions', 'cssClassName', 'allowSpidersToIndex',
 			'excludeFromLandingPage', 'availableDuringOfflineMode', 'requireObjectID'
 		];
@@ -805,7 +802,6 @@ class PagePackageInstallationPlugin extends AbstractXMLPackageInstallationPlugin
 			$page,
 			[
 				'handler' => '',
-				'controllerCustomURL' => '',
 				'hasFixedParent' => 0,
 				'parent' => '',
 				'options' => '',
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index dcb300669b..340cd0e1de 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -2423,8 +2423,6 @@ Kein Abschnitt darf leer sein und alle Abschnitten dürfen nur folgende Zeichen
 		<item name="wcf.acp.pip.page.contentMetaKeywords"><![CDATA[Meta Keywords]]></item>
 		<item name="wcf.acp.pip.page.contentTitle"><![CDATA[Titel]]></item>
 		<item name="wcf.acp.pip.page.controller"><![CDATA[Seiten-Controller]]></item>
-		<item name="wcf.acp.pip.page.controllerCustomURL"><![CDATA[Individuelle Controller-URL]]></item>
-		<item name="wcf.acp.pip.page.controllerCustomURL.description"><![CDATA[TODO]]></item>
 		<item name="wcf.acp.pip.page.cssClassName"><![CDATA[CSS-Klassen]]></item>
 		<item name="wcf.acp.pip.page.cssClassName.description"><![CDATA[Die durch Komma abgetrennte CSS-Klassen werden dem <kbd>body</kbd>-Element zugewiesen.]]></item>
 		<item name="wcf.acp.pip.page.excludeFromLandingPage"><![CDATA[Seite kann nicht als Startseite ausgewählt werden]]></item>
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index 941dc0a4e0..e9e334466b 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -2179,8 +2179,6 @@ If you have <strong>already bought the licenses for the listed apps</strong>, th
 		<item name="wcf.acp.pip.page.name.description"><![CDATA[The page name is displayed in the ACP on the page list.]]></item>
 		<item name="wcf.acp.pip.page.controller"><![CDATA[Page Controller]]></item>
 		<item name="wcf.acp.pip.page.handler"><![CDATA[Page Handler]]></item>
-		<item name="wcf.acp.pip.page.controllerCustomURL"><![CDATA[Custom Page URL]]></item>
-		<item name="wcf.acp.pip.page.controllerCustomURL.description"><![CDATA[TODO]]></item>
 		<item name="wcf.acp.pip.page.requireObjectID"><![CDATA[Requires Object ID]]></item>
 		<item name="wcf.acp.pip.page.requireObjectID.description"><![CDATA[The page requires an object id to be displayed.]]></item>
 		<item name="wcf.acp.pip.page.hasFixedParent"><![CDATA[Has Fixed Parent]]></item>