From: Coleman Watts <coleman@civicrm.org>
Date: Wed, 17 Apr 2013 21:14:40 +0000 (-0700)
Subject: Fix common CRM settings CRM-12339
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=4a7fe6f4c2455ba64663e0a6f2eee575b2666470;p=civicrm-core.git

Fix common CRM settings CRM-12339
---

diff --git a/CRM/Core/Resources.php b/CRM/Core/Resources.php
index 5b247f00b0..66e94d2b06 100644
--- a/CRM/Core/Resources.php
+++ b/CRM/Core/Resources.php
@@ -455,8 +455,8 @@ class CRM_Core_Resources {
 
       // Add global settings
       $settings = array(
-        'userFramework' => json_encode($config->userFramework),
-        'resourceBase' => json_encode($config->resourceBase),
+        'userFramework' => $config->userFramework,
+        'resourceBase' => $config->resourceBase,
       );
       $this->addSetting(array('config' => $settings));