Bug 20190: TinyMCE is broken and not displayed

Changes made by bug 12904 appear to have affected TinyMCE.

Test plan:
1) Edit a library, note the OPAC info editor is missing
2) Apply this patch
3) Reload the page
4) The editor is back!

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/wysiwyg-systempreferences.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/wysiwyg-systempreferences.inc
index 0573daa..1e23e9a 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/wysiwyg-systempreferences.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/wysiwyg-systempreferences.inc
@@ -9,6 +9,7 @@ function wysiwyg_change (ed){
     $(original_textarea).trigger("input");
 }
 
+tinyMCE.baseURL = "/intranet-tmpl/lib/tiny_mce";
 tinyMCE.init({
     setup : function(ed) {
         ed.onInit.add(function(editor){

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt
index 8890867..6bbbc2f 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt
@@ -267,6 +267,7 @@
                 });
             [% END %]
         });
+        tinyMCE.baseURL = "/intranet-tmpl/lib/tiny_mce";
         tinyMCE.init({
             mode : "textareas",
             theme : "advanced",

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/edithelp.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/edithelp.tt
index e21be5d..e99e1ca 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/edithelp.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/edithelp.tt
@@ -2,6 +2,7 @@
 <title>Online help</title>
 <script type="text/javascript" src="[% interface %]/lib/tiny_mce/tiny_mce_[% KOHA_VERSION %].js"></script>
 <script type="text/javascript">//<![CDATA[
+tinyMCE.baseURL = "/intranet-tmpl/lib/tiny_mce";
 tinyMCE.init({
        mode : "textareas",
         theme : "advanced",

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt
index 7482f3e..5273d46 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt
@@ -261,6 +261,7 @@ Edit news item[% ELSE %]Add news item[% END %][% ELSE %]News[% END %]</div>
     [% END %]
     <script type="text/javascript" src="[% interface %]/lib/tiny_mce/tiny_mce_[% KOHA_VERSION %].js"></script>
     <script type="text/javascript">
+        tinyMCE.baseURL = "/intranet-tmpl/lib/tiny_mce";
         tinyMCE.init({
             mode : "textareas",
             theme : "advanced",