From: Michael McMahon Date: Wed, 16 Dec 2020 21:57:12 +0000 (-0500) Subject: Adding LibreJS back after bundles refactor upstream X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=refs%2Fheads%2F5.36.1-fsf-michael-attempt-0;p=civicrm-core.git Adding LibreJS back after bundles refactor upstream --- diff --git a/CRM/Core/Region.php b/CRM/Core/Region.php index c7eab5c584..f4d86cee47 100644 --- a/CRM/Core/Region.php +++ b/CRM/Core/Region.php @@ -106,7 +106,7 @@ class CRM_Core_Region implements CRM_Core_Resources_CollectionInterface, CRM_Cor case 'script': if (!$allowCmsOverride || !$cms->addScript($snippet['script'], $this->_name)) { - $html .= sprintf("\n", $snippet['script']); + $html .= sprintf("\n", $snippet['script']); } break; @@ -133,7 +133,7 @@ class CRM_Core_Region implements CRM_Core_Resources_CollectionInterface, CRM_Cor $js = "(function(vars) { if (window.CRM) CRM.$.extend(true, CRM, vars); else window.CRM = vars; })($settingsData)"; - $html .= sprintf("\n", $js); + $html .= sprintf("\n", $js); break; default: diff --git a/setup/res/page.tpl.php b/setup/res/page.tpl.php index 3b3281cf67..42beaf0410 100644 --- a/setup/res/page.tpl.php +++ b/setup/res/page.tpl.php @@ -10,7 +10,7 @@ break; case 'script-code': - printf("", $pageAsset['code']); + printf("", $pageAsset['code']); break; case 'style-url':