Removed PAGE_URLS

diff --git a/com.woltlab.wcf/option.xml b/com.woltlab.wcf/option.xml
index ad3391db82e3d4f897fd48c27f6fbfc067bbd831..278acef8d24745c30e6581a0fe5a72101f707dde 100644 (file)
--- 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 d8a6b556b16f817de8d0feeff504318a31bb6154..71524984a6c3a3533b77f52bd625e565449e4c2e 100644 (file)
--- 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 55bb8cdebc2092710c42d2d06ceb9fab4641d574..5826c3a18ee9fb7395c08000ce008dac7140db16 100644 (file)
--- 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 6240cd171d740f07dec2f2fbda8fb029ca2ec0f2..97d2ee16096c00d721aea1037c0d4f5ece4868de 100644 (file)
--- 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>