Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2015-01-12-16-09-32

[civicrm-core.git] / templates / CRM / common / wysiwyg.tpl

diff --git a/templates/CRM/common/wysiwyg.tpl b/templates/CRM/common/wysiwyg.tpl
index 945b2843779bea2bb8711914a27a8b5b0af2528a..daff9466f2e17c3f1074a5cdf7ed99349f8aa8bf 100644 (file)
--- a/templates/CRM/common/wysiwyg.tpl
+++ b/templates/CRM/common/wysiwyg.tpl
@@ -1,6 +1,6 @@
 {*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.5                                                |
+ | CiviCRM version 4.6                                                |
  +--------------------------------------------------------------------+
  | Copyright CiviCRM LLC (c) 2004-2014                                |
  +--------------------------------------------------------------------+
@@ -29,8 +29,7 @@
     {if $defaultWysiwygEditor eq 1}
         <script>
           {* this version of tinymce requires jquery *}
-          if (typeof(jQuery) != 'function')
-            var jQuery = cj;
+          if (typeof window.jQuery !== 'function') window.jQuery = CRM.$;
         </script>
         <script type="text/javascript" src="{$config->resourceBase}packages/tinymce/jscripts/tiny_mce/jquery.tinymce.js"></script>
         <script type="text/javascript" src="{$config->resourceBase}packages/tinymce/jscripts/tiny_mce/tiny_mce.js"></script>