projects
/
civicrm-core.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
66659cd
)
CRM-16354 - Lookup wysiwyg by name not label
author
Coleman Watts
<coleman@civicrm.org>
Thu, 30 Apr 2015 01:57:18 +0000
(19:57 -0600)
committer
Coleman Watts
<coleman@civicrm.org>
Thu, 30 Apr 2015 01:57:18 +0000
(19:57 -0600)
CRM/Core/Resources.php
patch
|
blob
|
blame
|
history
diff --git
a/CRM/Core/Resources.php
b/CRM/Core/Resources.php
index 7af9603017b565b626c326e9d278aeab5316d7f9..dd4cc0bd2eb5db69744fe38f959d1d64684b15fd 100644
(file)
--- a/
CRM/Core/Resources.php
+++ b/
CRM/Core/Resources.php
@@
-716,11
+716,9
@@
class CRM_Core_Resources {
"js/crm.ajax.js",
);
// add wysiwyg editor
"js/crm.ajax.js",
);
// add wysiwyg editor
- $editorID = CRM_Core_BAO_Setting::getItem(CRM_Core_BAO_Setting::SYSTEM_PREFERENCES_NAME,
- 'editor_id'
- );
+ $editorID = CRM_Core_BAO_Setting::getItem(CRM_Core_BAO_Setting::SYSTEM_PREFERENCES_NAME, 'editor_id');
$editor = CRM_Utils_Array::value($editorID,
$editor = CRM_Utils_Array::value($editorID,
- CRM_Core_OptionGroup::values('wysiwyg_editor')
+ CRM_Core_OptionGroup::values('wysiwyg_editor'
, FALSE, FALSE, FALSE, NULL, 'name'
)
);
$items[] = "js/wysiwyg/crm.wysiwyg.js";
if ($editor == "CKEditor") {
);
$items[] = "js/wysiwyg/crm.wysiwyg.js";
if ($editor == "CKEditor") {