Index: tinymce.module
===================================================================
--- tinymce.module	(revision 424)
+++ tinymce.module	(working copy)
@@ -137,7 +137,7 @@
 
     $enable  = t('enable rich-text');
     $disable = t('disable rich-text');
-
+    
 $tinymce_invoke = <<<EOD
 
   tinyMCE.init({
@@ -160,10 +160,9 @@
     element = document.getElementById(id);
     link = document.getElementById(linkid);
     img_assist = document.getElementById('img_assist-link-'+ id);
-
-    if (tinyMCE.getEditorId(element.id) == null) {
-      tinyMCE.addMCEControl(element, element.id);
-      element.togg = 'on';
+    if (element._visible == false) {
+      tinyMCE.get(element.id).show();
+      element._visible = true;
       link.innerHTML = '$disable';
       link.href = "javascript:mceToggle('" +id+ "', '" +linkid+ "');";
       if (img_assist)
@@ -171,8 +170,8 @@
       link.blur();
     }
     else {
-      tinyMCE.removeMCEControl(tinyMCE.getEditorId(element.id));
-      element.togg = 'off';
+      tinyMCE.get(element.id).hide();
+      element._visible = false;
       link.innerHTML = '$enable';
       link.href = "javascript:mceToggle('" +id+ "', '" +linkid+ "');";
       if (img_assist)
@@ -195,19 +194,19 @@
   if (img_assist) {
     var img_assist_default_link = img_assist.innerHTML;
     if ('$img_assist_link' == 'yes') {
-      img_assist.innerHTML = tinyMCE.getEditorId('edit-$textarea_name') == null ? '' : img_assist_default_link;
+      img_assist.innerHTML = tinyMCE.get('edit-$textarea_name') == null ? '' : img_assist_default_link;
     }
     else {
-      img_assist.innerHTML = tinyMCE.getEditorId('edit-$textarea_name') == null ? img_assist_default_link : '';
+      img_assist.innerHTML = tinyMCE.get('edit-$textarea_name') == null ? img_assist_default_link : '';
     }
   }
   if (typeof(document.execCommand) == 'undefined') {
     img_assist.innerHTML = img_assist_default_link;
     document.write('<div style="font-size:x-small">$no_wysiwyg</div>');
+  } else {
+    //document.write("<div><a href=\"javascript:mceToggle('edit-$textarea_name', 'wysiwyg4$textarea_name');\" id=\"wysiwyg4$textarea_name\">$link_text</a></div>");
+    $('#edit-$textarea_name').after("<div><a href=\"javascript:mceToggle('edit-$textarea_name', 'wysiwyg4$textarea_name');\" id=\"wysiwyg4$textarea_name\">$link_text</a></div>");
   }
-  else {
-    document.write("<div><a href=\"javascript:mceToggle('edit-$textarea_name', 'wysiwyg4$textarea_name');\" id=\"wysiwyg4$textarea_name\">$link_text</a></div>");
-  }
 </script>
 EOD;
 
@@ -244,7 +243,12 @@
     }
     // Load a TinyMCE init for each textarea.
     if ($init) drupal_add_js($tinymce_invoke, 'inline');
-
+    
+    //settings are saved as strings, not booleans
+    if ($profile->settings['show_toggle'] == 'true') {
+       // Make sure to append to #suffix so it isn't completely overwritten
+       $element['#suffix'] .= $wysiwyg_link;
+    }
     // Set resizable to false to avoid drupal.js resizable function from taking control of the textarea
     $element['#resizable'] = FALSE;
   }