keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #8767 from MrPetovan/bug/8746-smarty-vars-leak

Browse source 
Clear all previous template variables before replacing Macros
This commit is contained in:
Michael Vogel 2020-06-13 08:19:16 +02:00 committed by GitHub
commit e3f8a653a1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 38 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Render/FriendicaSmartyEngine.php
View file

@ -83,6 +83,8 @@ final class FriendicaSmartyEngine extends TemplateEngine
Hook::callAll('template_vars', $arr); Hook::callAll('template_vars', $arr);
$vars = $arr['vars']; $vars = $arr['vars'];
$this->smarty->clearAllAssign();
foreach ($vars as $key => $value) { foreach ($vars as $key => $value) {
if ($key[0] === '$') { if ($key[0] === '$') {
$key = substr($key, 1); $key = substr($key, 1);

5
view/theme/frio/php/minimal.php
View file

@ -6,7 +6,10 @@
<?php if(!empty($page['htmlhead'])) echo $page['htmlhead'] ?> <?php if(!empty($page['htmlhead'])) echo $page['htmlhead'] ?>
</head> </head>
<body class="minimal"> <body class="minimal">
<section><?php if(!empty($page['content'])) echo $page['content']; ?> <section>
<div class="generic-page-wrapper">
<?php if(!empty($page['content'])) echo $page['content']; ?>
</div>
<div id="page-footer"></div> <div id="page-footer"></div>
</section> </section>
<!-- Modal --> <!-- Modal -->

2
view/theme/frio/templates/auto_request.tpl
View file

@ -1,4 +1,3 @@
<div class="generic-page-wrapper">
<h1>{{$header}}</h1> <h1>{{$header}}</h1>
{{if !$myaddr}} {{if !$myaddr}}
@ -42,4 +41,3 @@
<input class="btn btn-default" type="submit" name="cancel" id="dfrn-request-cancel-button" value="{{$cancel}}"> <input class="btn btn-default" type="submit" name="cancel" id="dfrn-request-cancel-button" value="{{$cancel}}">
</div> </div>
</form> </form>
</div>