Index: editors/js/ckeditor-3.0.js
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/wysiwyg/editors/js/ckeditor-3.0.js,v
retrieving revision 1.5
diff -u -p -r1.5 ckeditor-3.0.js
--- editors/js/ckeditor-3.0.js	23 Oct 2009 02:11:33 -0000	1.5
+++ editors/js/ckeditor-3.0.js	28 Oct 2009 17:47:46 -0000
@@ -58,7 +58,7 @@ Drupal.wysiwyg.editor.attach.ckeditor = 
       }
       else {
         // No indents or linebreaks;
-        for (var key in tags) {
+        for (var tag in tags) {
           if (tag == 'pre') {
             continue;
           }
@@ -76,7 +76,7 @@ Drupal.wysiwyg.editor.attach.ckeditor = 
     pluginsLoaded: function(ev) {
       // Override the conversion methods to let Drupal plugins modify the data.
       var editor = ev.editor;
-      if (editor.dataProcessor) {
+      if (editor.dataProcessor && Drupal.settings.wysiwyg.plugins[params.format] && Drupal.settings.wysiwyg.plugins[params.format].drupal) {
         editor.dataProcessor.toHtml = CKEDITOR.tools.override(editor.dataProcessor.toHtml, function(originalToHtml) {
           // Convert raw data for display in WYSIWYG mode.
           return function(data, fixForBody) {