Merge branch 'master' into develop

2019-12-12 18:46:45 +01:00
parent 4223f0f18a 4b7657eced
commit 70cb73a664
1 changed files with 0 additions and 10 deletions
@@ -1,10 +1,3 @@
-tmp.canonical = TEXT
-tmp.canonical {
-    typolink.parameter.data = TSFE:id
-    typolink.returnLast = url
-    wrap = <link rel="canonical" href="{$plugin.tx_eptheme.settings.canonicalBaseUrl}|"/>
-}
-
 page = PAGE
 page {
    meta {
@@ -145,9 +138,6 @@ page {
        <!-- End Google Tag Manager -->
    )
    headerData.999.stdWrap.if.isTrue = {$plugin.tx_eptheme.settings.googleTagManagerId}
-
-    headerData.100 < tmp.canonical
-    headerData.100.insertData = 1
 }

 [applicationContext == "Development"]