mirror of
https://github.com/Sarjuuk/aowow.git
synced 2025-11-29 15:58:16 +08:00
PageTemplate/Fixup
* really fix merging jsGlobals from comments/etc. into existing PageTemplate
This commit is contained in:
@@ -626,7 +626,7 @@ class TemplateResponse extends BaseResponse
|
|||||||
foreach ($this->jsGlobals as $type => [, $data, ])
|
foreach ($this->jsGlobals as $type => [, $data, ])
|
||||||
{
|
{
|
||||||
if (!isset($ptJSG[$type]) || $type == Type::USER)
|
if (!isset($ptJSG[$type]) || $type == Type::USER)
|
||||||
$ptJSGs[$type] = $this->jsGlobals[$type];
|
$ptJSG[$type] = $this->jsGlobals[$type];
|
||||||
else
|
else
|
||||||
Util::mergeJsGlobals($ptJSG[$type][1], $data);
|
Util::mergeJsGlobals($ptJSG[$type][1], $data);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user