tpl/tplimpl: Change calls to simple versions of embedded shortcodes

Closes #13700

diff --git a/tpl/tplimpl/embedded/templates/_shortcodes/twitter.html b/tpl/tplimpl/embedded/templates/_shortcodes/twitter.html
index ce356559d364c38ad8be4c5a3a425b541e40420b..849bad99efd14b1ac7d8b11f10ffe836fc39ec79 100644 (file)
--- a/tpl/tplimpl/embedded/templates/_shortcodes/twitter.html
+++ b/tpl/tplimpl/embedded/templates/_shortcodes/twitter.html
@@ -2,7 +2,7 @@
 {{- $pc := site.Config.Privacy.Twitter -}}
 {{- if not $pc.Disable -}}
   {{- if $pc.Simple -}}
-    {{- template "_internal/shortcodes/twitter_simple.html" . -}}
+    {{- template "_shortcodes/twitter_simple.html" . -}}
   {{- else -}}
     {{- $id := or (.Get "id") "" -}}
     {{- $user := or (.Get "user") "" -}}

diff --git a/tpl/tplimpl/embedded/templates/_shortcodes/vimeo.html b/tpl/tplimpl/embedded/templates/_shortcodes/vimeo.html
index 2588ac86cc186b00d14205d06ec89277a7a45d39..fb8ea0d97552b984f6835bcbc5feed2034427476 100644 (file)
--- a/tpl/tplimpl/embedded/templates/_shortcodes/vimeo.html
+++ b/tpl/tplimpl/embedded/templates/_shortcodes/vimeo.html
@@ -18,7 +18,7 @@ title, then loading.
 {{- $pc := site.Config.Privacy.Vimeo }}
 {{- if not $pc.Disable }}
   {{- if $pc.Simple }}
-    {{- template "_internal/shortcodes/vimeo_simple.html" . }}
+    {{- template "_shortcodes/vimeo_simple.html" . }}
   {{- else }}
     {{- $dnt := cond $pc.EnableDNT 1 0 }}
 

diff --git a/tpl/tplimpl/embedded/templates/_shortcodes/x.html b/tpl/tplimpl/embedded/templates/_shortcodes/x.html
index 28a5e331b91eba00ba53440dc1389a892815e7dc..87455530c5e8b65961de79b85faad2011c7d0427 100644 (file)
--- a/tpl/tplimpl/embedded/templates/_shortcodes/x.html
+++ b/tpl/tplimpl/embedded/templates/_shortcodes/x.html
@@ -1,7 +1,7 @@
 {{- $pc := site.Config.Privacy.X -}}
 {{- if not $pc.Disable -}}
   {{- if $pc.Simple -}}
-    {{- template "_internal/shortcodes/x_simple.html" . -}}
+    {{- template "_shortcodes/x_simple.html" . -}}
   {{- else -}}
     {{- $id := or (.Get "id") "" -}}
     {{- $user := or (.Get "user") "" -}}

diff --git a/tpl/tplimpl/shortcodes_integration_test.go b/tpl/tplimpl/shortcodes_integration_test.go
index 665760dec59210380f2cdf52c08852974134e52a..838dc16d745316dc162443cd4c0838f81706e9c3 100644 (file)
--- a/tpl/tplimpl/shortcodes_integration_test.go
+++ b/tpl/tplimpl/shortcodes_integration_test.go
@@ -460,7 +460,6 @@ title: p1 (de)
 }
 
 func TestVimeoShortcode(t *testing.T) {
-       t.Skip("Fix me: Upstream API changes")
        t.Parallel()
 
        files := `