From 2cf3ed6d7c1ca2fe090ecdf92b217122b88675c1 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Fri, 12 Jun 2020 22:05:12 -0400 Subject: [PATCH 1/2] [frio] Remove duplicate page wrapper in auto_request - [frio] Add page wrapper to minimal template (for sitewide theme settings) --- view/theme/frio/php/minimal.php | 5 +- view/theme/frio/templates/auto_request.tpl | 66 +++++++++++----------- 2 files changed, 36 insertions(+), 35 deletions(-) diff --git a/view/theme/frio/php/minimal.php b/view/theme/frio/php/minimal.php index ad4581ff0..43c530586 100644 --- a/view/theme/frio/php/minimal.php +++ b/view/theme/frio/php/minimal.php @@ -6,7 +6,10 @@ -
+
+
+ +
diff --git a/view/theme/frio/templates/auto_request.tpl b/view/theme/frio/templates/auto_request.tpl index a6f148723..eec9c7f3e 100644 --- a/view/theme/frio/templates/auto_request.tpl +++ b/view/theme/frio/templates/auto_request.tpl @@ -1,45 +1,43 @@ -
-

{{$header}}

+

{{$header}}

{{if !$myaddr}} -

- {{$page_desc nofilter}} -

-

- {{$invite_desc nofilter}} -

+

+ {{$page_desc nofilter}} +

+

+ {{$invite_desc nofilter}} +

{{/if}} -
+ {{if $url}} -
-
{{$url_label}}
-
{{$url}}
-
+
+
{{$url_label}}
+
{{$url}}
+
{{/if}} {{if $keywords}} -
-
{{$keywords_label}}
-
{{$keywords}}
-
+
+
{{$keywords_label}}
+
{{$keywords}}
+
{{/if}} -
- - {{if $myaddr}} - {{$myaddr}} - - {{else}} - - {{/if}} - -
-
+
+ + {{if $myaddr}} + {{$myaddr}} + + {{else}} + + {{/if}} + +
+
-
+
{{if $submit}} - + {{/if}} - -
- -
+ +
+ From f60697110eaaad543fb1fb2a840abc31d871b44f Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Fri, 12 Jun 2020 22:06:09 -0400 Subject: [PATCH 2/2] Clear all previous template variables before replacing Macros in FriendicaSmartyEngine - Prevents variables leaking between replaceMacros() calls --- src/Render/FriendicaSmartyEngine.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Render/FriendicaSmartyEngine.php b/src/Render/FriendicaSmartyEngine.php index 2c76ff025..0f5ee21f2 100644 --- a/src/Render/FriendicaSmartyEngine.php +++ b/src/Render/FriendicaSmartyEngine.php @@ -83,6 +83,8 @@ final class FriendicaSmartyEngine extends TemplateEngine Hook::callAll('template_vars', $arr); $vars = $arr['vars']; + $this->smarty->clearAllAssign(); + foreach ($vars as $key => $value) { if ($key[0] === '$') { $key = substr($key, 1);