Added module setting to turn off the AMP

Closes #3180

diff --git a/com.woltlab.wcf/option.xml b/com.woltlab.wcf/option.xml
index 8d53043e68594fab516014be5f2b9ca8f588fa16..4b09f063639fbeb0674024e5f15d998dfc63fe24 100644 (file)
--- a/com.woltlab.wcf/option.xml
+++ b/com.woltlab.wcf/option.xml
@@ -307,6 +307,11 @@
                                <optiontype>boolean</optiontype>
                                <defaultvalue>1</defaultvalue>
                        </option>
+                       <option name="module_amp">
+                               <categoryname>module.content</categoryname>
+                               <optiontype>boolean</optiontype>
+                               <defaultvalue>1</defaultvalue>
+                       </option>
                        <option name="module_smiley">
                                <categoryname>module.customization</categoryname>
                                <optiontype>boolean</optiontype>

diff --git a/com.woltlab.wcf/templates/article.tpl b/com.woltlab.wcf/templates/article.tpl
index 9cb2f6d7926a13792c57488d470eeb9d21564181..b84c63f62bb5373323301f0e8bbd827c92f98ae9 100644 (file)
--- a/com.woltlab.wcf/templates/article.tpl
+++ b/com.woltlab.wcf/templates/article.tpl
@@ -110,7 +110,9 @@
                        {/if}
                {/foreach}
        {/if}
-       <link rel="amphtml" href="{link controller='ArticleAmp' object=$articleContent}{/link}">
+       {if MODULE_AMP}
+               <link rel="amphtml" href="{link controller='ArticleAmp' object=$articleContent}{/link}">
+       {/if}
 {/capture}
 
 {include file='header'}

diff --git a/wcfsetup/install/files/lib/page/ArticleAmpPage.class.php b/wcfsetup/install/files/lib/page/ArticleAmpPage.class.php
index 05eca840ee2138482267ffdb5f0c2be6b813daea..093ca704f51ea26dc9b7cbf9f9f7634effe2c686 100644 (file)
--- a/wcfsetup/install/files/lib/page/ArticleAmpPage.class.php
+++ b/wcfsetup/install/files/lib/page/ArticleAmpPage.class.php
@@ -20,6 +20,11 @@ class ArticleAmpPage extends AbstractArticlePage {
         */
        public $templateName = 'ampArticle';
        
+       /**
+        * @inheritDoc
+        */
+       public $neededModules = ['MODULE_ARTICLE', 'MODULE_AMP'];
+       
        /**
         * list of additional articles
         * @var ViewableArticle[]

diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index ee4969c509e24ac5adce727fcd7e9369022764a2..2e7bdcbc207d6d3fb7b63474fd787b77a425bd98 100644 (file)
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -1754,6 +1754,7 @@ 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[<abbr title="Accelerated Mobile Pages">AMP</abbr>]]></item>
        </category>
        <category name="wcf.acp.customOption">
                <item name="wcf.acp.customOption.list"><![CDATA[Eingabefelder]]></item>

diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index 0e2aa2dbe2779ed34253d6cd0c21ce2250ddf443..1b757ffc69ef61af20d02fac5c0f4c35f707e258 100644 (file)
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -1739,6 +1739,7 @@ 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[<abbr title="Accelerated Mobile Pages">AMP</abbr>]]></item>
        </category>
        <category name="wcf.acp.customOption">
                <item name="wcf.acp.customOption.list"><![CDATA[Option Fields]]></item>