From 3fc5c1ad840f98926319478a855dab3686a0ace3 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sun, 23 Dec 2018 10:51:00 -0500 Subject: [PATCH 1/2] Fix escaping in email notification template --- view/templates/email_notify_html.tpl | 42 +++++++++++++++------------- 1 file changed, 23 insertions(+), 19 deletions(-) diff --git a/view/templates/email_notify_html.tpl b/view/templates/email_notify_html.tpl index 94fac7447..d9eeb841f 100644 --- a/view/templates/email_notify_html.tpl +++ b/view/templates/email_notify_html.tpl @@ -1,4 +1,3 @@ - @@ -6,28 +5,33 @@ - +
- + + + + - - - - {{if $content_allowed}} +{{if $content_allowed}} {{if $source_photo}} - - - {{/if}} - - - {{/if}} - - - - + + + + + {{/if}} + + +{{/if}} + + + + -
{{$product}}
+ +
{{$product}}
+
+
{{$preamble nofilter}}
{{$preamble}}
{{$source_name}}
{{$title}}
{{$htmlversion}}
{{$hsitelink}}
{{$hitemlink}}
{{$thanks}}
{{$site_admin}}
{{$source_name}}
{{$title}}
{{$htmlversion nofilter}}
{{$hsitelink nofilter}}
{{$hitemlink nofilter}}
{{$thanks}}
{{$site_admin}}
+ - From b1e85ba605c46328ab8af92abd8871db70591897 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sun, 23 Dec 2018 10:51:18 -0500 Subject: [PATCH 2/2] Fix template escaping in photo gallery view --- view/templates/photo_view.tpl | 10 +++++----- view/theme/frio/templates/photo_view.tpl | 10 +++++----- view/theme/quattro/templates/photo_view.tpl | 10 +++++----- view/theme/vier/templates/photo_view.tpl | 10 +++++----- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/view/templates/photo_view.tpl b/view/templates/photo_view.tpl index d5c3d6826..4f5be40fc 100644 --- a/view/templates/photo_view.tpl +++ b/view/templates/photo_view.tpl @@ -22,17 +22,17 @@ {{/if}} {{if $tags.2}}{{/if}} -{{if $edit}}{{$edit}}{{/if}} +{{if $edit}}{{$edit nofilter}}{{/if}} {{if $likebuttons}}
- {{$likebuttons}} - {{$like}} - {{$dislike}} + {{$likebuttons nofilter}} + {{$like nofilter}} + {{$dislike nofilter}}
{{/if}} -{{$comments}} +{{$comments nofilter}} {{$paginate nofilter}} diff --git a/view/theme/frio/templates/photo_view.tpl b/view/theme/frio/templates/photo_view.tpl index 1d39b16ee..359c42669 100644 --- a/view/theme/frio/templates/photo_view.tpl +++ b/view/theme/frio/templates/photo_view.tpl @@ -68,13 +68,13 @@ {{/if}} {{* The part for editing the photo - only available for the edit subpage *}} - {{if $edit}}{{$edit}}{{/if}} + {{if $edit}}{{$edit nofilter}}{{/if}} {{if $likebuttons}}
- {{$likebuttons}} - {{$like}} - {{$dislike}} + {{$likebuttons nofilter}} + {{$like nofilter}} + {{$dislike nofilter}}
{{/if}}
@@ -82,7 +82,7 @@ {{* Insert the comments *}}
- {{$comments}} + {{$comments nofilter}}
{{$paginate nofilter}} diff --git a/view/theme/quattro/templates/photo_view.tpl b/view/theme/quattro/templates/photo_view.tpl index cd1a7ccc9..0b65c2c53 100644 --- a/view/theme/quattro/templates/photo_view.tpl +++ b/view/theme/quattro/templates/photo_view.tpl @@ -20,18 +20,18 @@ {{/if}} {{if $tags.2}}{{/if}} -{{if $edit}}{{$edit}}{{/if}} +{{if $edit}}{{$edit nofilter}}{{/if}} {{if $likebuttons}}
- {{$likebuttons}} - {{$like}} - {{$dislike}} + {{$likebuttons nofilter}} + {{$like nofilter}} + {{$dislike nofilter}}
{{/if}}
- {{$comments}} + {{$comments nofilter}}
{{$paginate nofilter}} diff --git a/view/theme/vier/templates/photo_view.tpl b/view/theme/vier/templates/photo_view.tpl index 21eda89b3..aa3f7aadd 100644 --- a/view/theme/vier/templates/photo_view.tpl +++ b/view/theme/vier/templates/photo_view.tpl @@ -22,18 +22,18 @@ {{/if}} {{if $tags.2}}{{/if}} -{{if $edit}}{{$edit}}{{/if}} +{{if $edit}}{{$edit nofilter}}{{/if}} {{if $likebuttons}}
- {{$likebuttons}} - {{$like}} - {{$dislike}} + {{$likebuttons nofilter}} + {{$like nofilter}} + {{$dislike nofilter}}
{{/if}}
-{{$comments}} + {{$comments nofilter}}
{{$paginate nofilter}}