yolinlin/aowow
1
0
Fork 0
mirror of https://github.com/Sarjuuk/aowow.git synced 2025-11-29 15:58:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

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 // as this may be loaded from cache, it will be unlinked from its response
if ($ptJSG = $this->result->jsGlobals) 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; $this->result->jsGlobals = $ptJSG;
} }
else if ($this->jsGlobals) else if ($this->jsGlobals)