Skip to content

Commit

Permalink
Merge pull request #12846 from jdalsem/various-stuff
Browse files Browse the repository at this point in the history
fix(js): deep merge the elgg.data
  • Loading branch information
jdalsem committed Oct 1, 2019
2 parents 6bcb10d + 197bfb4 commit 9ebe362
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion views/default/elgg.js.php
Expand Up @@ -44,7 +44,7 @@
//<script>

// page data overrides site data
$.extend(elgg.data, elgg._data);
elgg.data = $.extend(true, {}, elgg.data, elgg._data);
delete elgg._data;

// jQuery and UI must be loaded sync in 2.x but modules should depend on these AMD modules
Expand Down

0 comments on commit 9ebe362

Please sign in to comment.