Deprecated AMP support

PR #4803 accidentally had the wrong target branch.

(cherry picked from commit 8c97dca561b32b3c02f3cb30b32574a8f83b8bd5)

diff --git a/com.woltlab.wcf/option.xml b/com.woltlab.wcf/option.xml
index dd1ce33cf5a56014b83d8a09b27979e96302accf..5f0d582c60c1a246d62b3ea9454218aa29d05e5f 100644 (file)
--- a/com.woltlab.wcf/option.xml
+++ b/com.woltlab.wcf/option.xml
@@ -300,10 +300,10 @@
                                <optiontype>boolean</optiontype>
                                <defaultvalue>1</defaultvalue>
                        </option>
-                       <option name="module_amp">
+                       <option name="module_amp"><!-- deprecated: Support for AMP will be removed in 6.0 -->
                                <categoryname>module.content</categoryname>
                                <optiontype>boolean</optiontype>
-                               <defaultvalue>1</defaultvalue>
+                               <defaultvalue>0</defaultvalue>
                        </option>
                        <option name="module_smiley">
                                <categoryname>module.customization</categoryname>

diff --git a/wcfsetup/install/files/lib/page/ArticleAmpPage.class.php b/wcfsetup/install/files/lib/page/ArticleAmpPage.class.php
index 1e058aeed338feebcce0747a9b5be8594a23fc5f..10bbe6836ae2ac5007eea755ee1dfb3b075865e7 100644 (file)
--- a/wcfsetup/install/files/lib/page/ArticleAmpPage.class.php
+++ b/wcfsetup/install/files/lib/page/ArticleAmpPage.class.php
@@ -15,6 +15,7 @@ use wcf\system\WCF;
  * @license GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  * @package WoltLabSuite\Core\Page
  * @since   3.0
+ * @deprecated 5.5 Support for AMP will be removed in 6.0
  */
 class ArticleAmpPage extends AbstractArticlePage
 {

diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index 7c0bf15973cee1ca66233cf69bbc7baac1996c39..adb09c71007f7c860f33de6cfdc6bc881590ccda 100644 (file)
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -1757,8 +1757,8 @@ Die Datenbestände werden sorgfältig gepflegt, aber es ist nicht ausgeschlossen
                <item name="wcf.acp.option.blacklist_sfs_action.block"><![CDATA[Blockieren]]></item>
                <item name="wcf.acp.option.blacklist_sfs_action.description"><![CDATA[Es besteht immer das Risiko eines fehlerhaften Eintrages, daher wird die Einstellung <strong>Deaktivierung, erfordert manuelle Freischaltung</strong> ausdrücklich empfohlen.]]></item>
                <item name="wcf.acp.option.blacklist_sfs_action.disable"><![CDATA[Deaktivierung, erfordert manuelle Freischaltung]]></item>
-               <item name="wcf.acp.option.module_amp"><![CDATA[AMP]]></item>
-               <item name="wcf.acp.option.module_amp.description"><![CDATA[Aktiviert <abbr title="Accelerated Mobile Pages">AMP</abbr>-Versionen von bestimmten Seiten (z. B. Artikeln).]]></item>
+               <item name="wcf.acp.option.module_amp"><![CDATA[AMP (Obsolet)]]></item>
+               <item name="wcf.acp.option.module_amp.description"><![CDATA[Aus Datenschutzgründen ist die Verwendung von <abbr title="Accelerated Mobile Pages">AMP</abbr> nicht empfohlen. Die Funktion wird in einer zukünftigen Version entfernt.]]></item>
                <item name="wcf.acp.option.message_enable_user_consent"><![CDATA[Inhalte von externen Anbietern erst nach Zustimmung anzeigen]]></item>
                <item name="wcf.acp.option.modification_log_expiration"><![CDATA[Speicherzeit für Änderungen]]></item>
                <item name="wcf.acp.option.modification_log_expiration.description"><![CDATA[Zeitraum, nachdem alte Änderungen aus dem Änderungsprotokoll entfernt werden [0, um die Entfernung gänzlich zu deaktivieren]]]></item>

diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index 752a3c139fbc478953933aa2df8b2fba92db46a1..f9e31fb916eca72809ba404080cd1d7f4d36ad0c 100644 (file)
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -1743,8 +1743,8 @@ The database is carefully maintained, but there will be always be a margin of er
                <item name="wcf.acp.option.blacklist_sfs_action.block"><![CDATA[Block]]></item>
                <item name="wcf.acp.option.blacklist_sfs_action.description"><![CDATA[There is always the risk of a false-positive match, therefore it is highly recommended to set it to <strong>Disable and require manual approval</strong>.]]></item>
                <item name="wcf.acp.option.blacklist_sfs_action.disable"><![CDATA[Disable and require manual approval]]></item>
-               <item name="wcf.acp.option.module_amp"><![CDATA[AMP]]></item>
-               <item name="wcf.acp.option.module_amp.description"><![CDATA[Enables <abbr title="Accelerated Mobile Pages">AMP</abbr> versions of certain pages (e.g. articles).]]></item>
+               <item name="wcf.acp.option.module_amp"><![CDATA[AMP (Not Recommended)]]></item>
+               <item name="wcf.acp.option.module_amp.description"><![CDATA[Enabling <abbr title="Accelerated Mobile Pages">AMP</abbr> is not recommended due to privacy concerns. This function will be removed in a future version.]]></item>
                <item name="wcf.acp.option.message_enable_user_consent"><![CDATA[Prompt users before displaying content from external sources]]></item>
                <item name="wcf.acp.option.modification_log_expiration"><![CDATA[Storage Time for Modification Logs]]></item>
                <item name="wcf.acp.option.modification_log_expiration.description"><![CDATA[Modification logs will be deleted after the entered amount of days. To disable deleting old modification logs, enter “0”.]]></item>