From: Coleman Watts <coleman@civicrm.org>
Date: Thu, 30 Apr 2015 01:57:18 +0000 (-0600)
Subject: CRM-16354 - Lookup wysiwyg by name not label
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=fd379059e62023de9b424c5e3c0a09842b0ea9ab;hp=66659cd7c1c1a2dcc5a524a6986e039d14333f60;p=civicrm-core.git

CRM-16354 - Lookup wysiwyg by name not label
---

diff --git a/CRM/Core/Resources.php b/CRM/Core/Resources.php
index 7af9603017..dd4cc0bd2e 100644
--- 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
-    $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,
-      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") {