From 7060d17762b5e9c5f12bce1c544e52c53a377df7 Mon Sep 17 00:00:00 2001 From: Coleman Watts Date: Wed, 4 Nov 2015 16:45:43 -0500 Subject: [PATCH] Minor cleanup --- CRM/Core/Resources.php | 2 +- CRM/Core/Smarty/plugins/function.crmVersion.php | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/CRM/Core/Resources.php b/CRM/Core/Resources.php index 39ae78a90c..95a74f13e8 100644 --- a/CRM/Core/Resources.php +++ b/CRM/Core/Resources.php @@ -721,10 +721,10 @@ class CRM_Core_Resources { "packages/jquery/plugins/jquery.ui.datepicker.validation.min.js", "js/Common.js", "js/crm.ajax.js", + "js/wysiwyg/crm.wysiwyg.js", ); // add wysiwyg editor $editor = CRM_Core_BAO_Setting::getItem(CRM_Core_BAO_Setting::SYSTEM_PREFERENCES_NAME, 'editor_id'); - $items[] = "js/wysiwyg/crm.wysiwyg.js"; if ($editor == "CKEditor") { $items[] = "js/wysiwyg/crm.ckeditor.js"; $ckConfig = CRM_Admin_Page_CKEditorConfig::getConfigUrl(); diff --git a/CRM/Core/Smarty/plugins/function.crmVersion.php b/CRM/Core/Smarty/plugins/function.crmVersion.php index b16331b777..5e170b3fff 100644 --- a/CRM/Core/Smarty/plugins/function.crmVersion.php +++ b/CRM/Core/Smarty/plugins/function.crmVersion.php @@ -50,10 +50,8 @@ function smarty_function_crmVersion($params, &$smarty) { $version = CRM_Utils_System::version(); - $redact = !CRM_Core_Permission::check('access CiviCRM'); - if ($redact) { - $parts = explode('.', $version); - $version = $parts[0] . '.' . $parts[1] . '.x'; + if (!CRM_Core_Permission::check('access CiviCRM')) { + $version = CRM_Utils_System::majorVersion(); } if (isset($params['assign'])) { -- 2.25.1