From 65a6368e968da53ea0fdf8af44cc82c332c689fc Mon Sep 17 00:00:00 2001
From: Lisa Marie Maginnis <lisam@fsf.org>
Date: Wed, 14 Oct 2015 23:10:17 -0400
Subject: [PATCH] reverted js changes back to upstream

---
 CRM/Core/Resources.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/CRM/Core/Resources.php b/CRM/Core/Resources.php
index 08c3f91512..6a7b2aa5a1 100644
--- 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);
   }
-- 
2.25.1