coa/aowow
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

PageTemplate/Fixup

Browse source 
* fix merging jsGlobals from comments/etc. into existing PageTemplate
This commit is contained in:
Sarjuuk 2025-10-04 16:24:13 +02:00
parent 5355989015
commit 4fe35d9e3c
1 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
includes/components/response/templateresponse.class.php
View file

@ -625,7 +625,14 @@ class TemplateResponse extends BaseResponse
// as this may be loaded from cache, it will be unlinked from its response
if ($ptJSG = $this->result->jsGlobals)
{
Util::mergeJsGlobals($ptJSG, $this->jsGlobals);
foreach ($this->jsGlobals as $type => [, $data, ])
{
if (!isset($ptJSG[$type]) || $type == Type::USER)
$ptJSGs[$type] = $this->jsGlobals[$type];
else
Util::mergeJsGlobals($ptJSG[$type][1], $data);
}
$this->result->jsGlobals = $ptJSG;
}
else if ($this->jsGlobals)