Template/JSGlobals
* fixed merging js globals from dynamic content into cached js globals * e.g. commenting with item markup on an item page will again create proper item links
This commit is contained in:
parent
ffffc16d63
commit
957f3bcf20
1 changed files with 6 additions and 1 deletions
|
|
@ -634,7 +634,12 @@ class TemplateResponse extends BaseResponse
|
|||
if (!isset($ptJSG[$type]) || $type == Type::USER)
|
||||
$ptJSG[$type] = $this->jsGlobals[$type];
|
||||
else
|
||||
Util::mergeJsGlobals($ptJSG[$type][1], $data);
|
||||
{
|
||||
$masterJSG = [$type => &$ptJSG[$type][1]];
|
||||
Util::mergeJsGlobals($masterJSG, [$type => $data]);
|
||||
}
|
||||
|
||||
unset($masterJSG);
|
||||
}
|
||||
|
||||
$this->result->jsGlobals = $ptJSG;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue