Index: wysiwyg_editor.js
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/wysiwyg/wysiwyg_editor.js,v
retrieving revision 1.1.2.6
diff -r1.1.2.6 wysiwyg_editor.js
23c23,27
<     tinyMCE.loadPlugin(plugin, Drupal.settings.wysiwygEditor.plugins[plugin]);
---
>     if (tinyMCE.addI18n) {
>       //tinymce.PluginManager.load(plugin, Drupal.settings.wysiwygEditor.plugins[plugin] + '/editor_plugin.js');
>     } else {
>       tinyMCE.loadPlugin(plugin, Drupal.settings.wysiwygEditor.plugins[plugin]);
>     }
52a57,72
> Drupal.tinyMCERemoveControl = function(id) {
>   if (tinyMCE.activeEditor) {
>     tinyMCE.execCommand('mceRemoveControl', false, id);
>   } else {
>     tinyMCE.removeMCEControl(tinyMCE.getEditorId(id));
>   }
> }
> 
> Drupal.tinyMCEAddControl = function(id) {
>   if (tinyMCE.activeEditor) {
>     tinyMCE.execCommand('mceAddControl', true, id);
>   } else {
>     tinyMCE.addMCEControl($('#' + id).get(0), id);
>   }
> }
> 
57c77,78
<   if (tinyMCE.getEditorId(id) == null) {
---
>   var state = tinyMCE.activeEditor ? tinyMCE.get(id) : tinyMCE.getEditorId(id);
>   if (state == null) {
63c84
<     tinyMCE.addMCEControl($('#' + id).get(0), id);
---
>     Drupal.tinyMCEAddControl(id);
67c88
<     tinyMCE.removeMCEControl(tinyMCE.getEditorId(id));
---
>     Drupal.tinyMCERemoveControl(id);