projects
/
civicrm-core.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9d5f946
)
Fix common CRM settings CRM-12339
author
Coleman Watts
<coleman@civicrm.org>
Wed, 17 Apr 2013 21:14:40 +0000
(14:14 -0700)
committer
Coleman Watts
<coleman@civicrm.org>
Wed, 17 Apr 2013 21:14:40 +0000
(14:14 -0700)
CRM/Core/Resources.php
patch
|
blob
|
blame
|
history
diff --git
a/CRM/Core/Resources.php
b/CRM/Core/Resources.php
index 5b247f00b0567e1c569a97cfd384d84698c6e1b8..66e94d2b067360f0063a65bb8d9066acdc595e25 100644
(file)
--- 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));