Centralize wysiwyg code for livepage

diff --git a/CRM/Admin/Page/Options.php b/CRM/Admin/Page/Options.php
index 79718f1f3b4dc4d684b247d297e8a23f15f3da29..7ef8bcd1abce438df5a9306fcee94216749e9424 100644 (file)
--- a/CRM/Admin/Page/Options.php
+++ b/CRM/Admin/Page/Options.php
@@ -247,7 +247,6 @@ class CRM_Admin_Page_Options extends CRM_Core_Page_Basic {
         $optionValue[$key]['financial_account'] = CRM_Financial_BAO_FinancialTypeAccount::getFinancialAccount($key, 'civicrm_option_value');
       }
     }
-    $this->assign('includeWysiwygEditor', TRUE);
     $this->assign('rows', $optionValue);
   }
 

diff --git a/CRM/Campaign/Page/SurveyType.php b/CRM/Campaign/Page/SurveyType.php
index bbfd94bda43115aa322461c3a1d9ae3e8adaf07d..ac81e4081b08c06f95f5c32eabd4b49c1d81001a 100644 (file)
--- a/CRM/Campaign/Page/SurveyType.php
+++ b/CRM/Campaign/Page/SurveyType.php
@@ -157,8 +157,6 @@ class CRM_Campaign_Page_SurveyType extends CRM_Core_Page_Basic {
    * @static
    */
   function browse() {
-    $this->assign('includeWysiwygEditor', TRUE);
-
     $campaingCompId = CRM_Core_Component::getComponentID('CiviCampaign');
     $groupParams    = array('name' => $this->_gName);
     $optionValues   = CRM_Core_OptionValue::getRows($groupParams, $this->links(), 'component_id,weight');

diff --git a/CRM/Case/Page/DashBoard.php b/CRM/Case/Page/DashBoard.php
index bda16cbbc463a13b5fb69c509493f75679ef2623..7e03445653a391e35e4db4b3cb1550d6ac707d09 100644 (file)
--- a/CRM/Case/Page/DashBoard.php
+++ b/CRM/Case/Page/DashBoard.php
@@ -98,7 +98,6 @@ class CRM_Case_Page_DashBoard extends CRM_Core_Page {
     if (!empty($recent)) {
       $this->assign('recentCases', $recent);
     }
-    $this->assign('includeWysiwygEditor', TRUE);
   }
 
   /**

diff --git a/CRM/Core/Page.php b/CRM/Core/Page.php
index 63fe8b4d0f8799bceedd0b9419be0d9b0a81db80..324acd6f5a4d88516fe6ef18e22d4803b3257156 100644 (file)
--- a/CRM/Core/Page.php
+++ b/CRM/Core/Page.php
@@ -235,6 +235,7 @@ class CRM_Core_Page {
       CRM_Core_BAO_Setting::getItem(CRM_Core_BAO_Setting::SYSTEM_PREFERENCES_NAME, 'ajaxPopupsEnabled', NULL, TRUE))
     {
       CRM_Core_Resources::singleton()->addScriptFile('civicrm', 'js/crm.livePage.js');
+      $this->assign('includeWysiwygEditor', TRUE);
     }
 
     $content = self::$_template->fetch('CRM/common/' . strtolower($config->userFramework) . '.tpl');