Minor cleanup

diff --git a/CRM/Core/Resources.php b/CRM/Core/Resources.php
index 39ae78a90c9391e2edb61afca461018a3602c72d..95a74f13e814a0cbe5131870bcaf2415f511029b 100644 (file)
--- 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 b16331b777eb79e49dd5886453237035e035e8b3..5e170b3ffffdd9f97588abb922e9e3ac85a88a01 100644 (file)
--- 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'])) {