From: Alexander Ebert <ebert@woltlab.com>
Date: Mon, 5 Nov 2012 16:26:23 +0000 (+0100)
Subject: Removed PAGE_URLS
X-Git-Tag: 2.0.0_Beta_1~811
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=dd8343178c77e729bcda928f0c7f357692637abc;p=GitHub%2FWoltLab%2FWCF.git

Removed PAGE_URLS
---

diff --git a/com.woltlab.wcf/option.xml b/com.woltlab.wcf/option.xml
index ad3391db82..278acef8d2 100644
--- a/com.woltlab.wcf/option.xml
+++ b/com.woltlab.wcf/option.xml
@@ -149,10 +149,6 @@
 				<supporti18n>1</supporti18n>
 				<requirei18n>0</requirei18n>
 			</option>
-			<option name="page_urls">
-				<categoryname>general.page</categoryname>
-				<optiontype>textarea</optiontype>
-			</option>
 			<option name="meta_keywords">
 				<categoryname>general.page</categoryname>
 				<optiontype>text</optiontype>
@@ -183,15 +179,6 @@ imagick:wcf.acp.option.image_adapter_type.imagick]]>
 				<defaultvalue>wcf_</defaultvalue>
 				<validationpattern>.+</validationpattern>
 			</option>
-			<option name="cookie_path">
-				<categoryname>general.http.cookie</categoryname>
-				<optiontype>text</optiontype>
-				<defaultvalue></defaultvalue>
-			</option>
-			<option name="cookie_domain">
-				<categoryname>general.http.cookie</categoryname>
-				<optiontype>text</optiontype>
-			</option>
 			<!-- /general.http.cookie-->
 			
 			<!-- general.http.http -->
diff --git a/wcfsetup/install/files/lib/system/application/ApplicationHandler.class.php b/wcfsetup/install/files/lib/system/application/ApplicationHandler.class.php
index d8a6b556b1..71524984a6 100644
--- a/wcfsetup/install/files/lib/system/application/ApplicationHandler.class.php
+++ b/wcfsetup/install/files/lib/system/application/ApplicationHandler.class.php
@@ -156,13 +156,6 @@ class ApplicationHandler extends SingletonFactory {
 			foreach ($this->getApplications() as $application) {
 				$this->pageURLs[] = $application->getPageURL();
 			}
-			
-			if (defined('PAGE_URLS') && PAGE_URLS != '') {
-				$pageURLs = explode("\n", StringUtil::unifyNewlines(PAGE_URLS));
-				foreach ($pageURLs as $url) {
-					$this->pageURLs[] = StringUtil::trim($url);
-				}
-			}
 		}
 		
 		foreach ($this->pageURLs as $pageURL) {
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index 55bb8cdebc..5826c3a18e 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -312,8 +312,6 @@
 		<item name="wcf.acp.option.page_description"><![CDATA[Seitenbeschreibung]]></item>
 		<item name="wcf.acp.option.page_title"><![CDATA[Titel der Seite]]></item>
 		<item name="wcf.acp.option.page_title.description"><![CDATA[Dieser Titel wird im Seitenkopf dargestellt, wenn Sie die Anzeige dieses Textes im Stileditor aktiviert haben.]]></item>
-		<item name="wcf.acp.option.page_urls"><![CDATA[Weitere Adressen (URLs)]]></item>
-		<item name="wcf.acp.option.page_urls.description"><![CDATA[Weitere Adressen (URLs) unter denen Ihre Seite erreichbar ist.]]></item>
 		<item name="wcf.acp.option.proxy_server_http"><![CDATA[Proxy-Server (HTTP)]]></item>
 		<item name="wcf.acp.option.session_timeout"><![CDATA[Gültigkeitslänge einer Sitzung]]></item>
 		<item name="wcf.acp.option.session_timeout.description"><![CDATA[Angabe in Sekunden]]></item>
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index 6240cd171d..97d2ee1609 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -275,8 +275,6 @@
 		<item name="wcf.acp.option.page_description"><![CDATA[Page description]]></item>
 		<item name="wcf.acp.option.page_title"><![CDATA[Page title]]></item>
 		<item name="wcf.acp.option.page_title.description"><![CDATA[That title will show up inside the page header, if you have enabled it with the style editor.]]></item>
-		<item name="wcf.acp.option.page_urls"><![CDATA[Further adresses (URLs)]]></item>
-		<item name="wcf.acp.option.page_urls.description"><![CDATA[Enter further adresses (URLs) which also link to your site.]]></item>
 		<item name="wcf.acp.option.proxy_server_http"><![CDATA[Proxy-Server (HTTP)]]></item>
 		<item name="wcf.acp.option.session_timeout"><![CDATA[Session timeout]]></item>
 		<item name="wcf.acp.option.session_timeout.description"><![CDATA[Enter the time a session should remain valid [seconds].]]></item>