reverted js changes back to upstream

diff --git a/CRM/Core/Resources.php b/CRM/Core/Resources.php
index 08c3f915128ee132ced3fa099132fa8edb3e50ca..6a7b2aa5a105296efe602af2493f6f2ad46806f6 100644 (file)
--- a/CRM/Core/Resources.php
+++ b/CRM/Core/Resources.php
@@ -342,7 +342,7 @@ class CRM_Core_Resources {
    * @return string
    */
   public function renderSetting() {
-    /*// On a standard page request we construct the CRM object from scratch
+    // On a standard page request we construct the CRM object from scratch
     if (!self::isAjaxMode()) {
       $js = 'var CRM = ' . json_encode($this->getSettings()) . ';';
     }
@@ -350,9 +350,7 @@ class CRM_Core_Resources {
     else {
       $js = 'CRM.$.extend(true, CRM, ' . json_encode($this->getSettings()) . ');';
     }
-    return sprintf("<script type=\"text/javascript\">\n%s\n</script>\n", $js);
-    */
-    $js = 'var CRM = ' . json_encode($this->getSettings()) . ';';
+
     //return sprintf("<script type=\"text/javascript\">\n%s\n</script>\n", $js);
     return sprintf("<script type=\"text/javascript\">\n// @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-v3\n%s\n// @license-end\n</script>\n", $js);
   }