--- img_upload.js?revision=1.1.2.2	2008-10-24 21:14:17.000000000 -0500
+++ img_upload.js	2008-10-24 21:11:14.000000000 -0500
@@ -4,29 +4,33 @@
     var config = YAHOO.Drupal.editors[e].config;
 
     if (config.img_upload == 1) {
-      yui_img_uploader(myEditor, '?q=/yui_editor/image_upload', 'files[upload]', config.base_path);
+      yui_img_uploader(myEditor, config.base_path + '?q=/yui_editor/image_upload', 'files[upload]', config.base_path, YAHOO.Drupal.editors[e].id);
     }
   }
 }
 
-function yui_img_uploader(rte, upload_url, upload_image_name, base_path) {
+function yui_img_uploader(rte, upload_url, upload_image_name, base_path, id) {
   rte.addListener('toolbarLoaded', function() {
     rte.toolbar.addListener('insertimageClick', function(o) {
       try {
-        var imgPanel = new YAHOO.util.Element('yui-editor-panel');
+        var imgPanel = new YAHOO.util.Element(id+'-panel');
         imgPanel.on ('contentReady', function() {
           try {
             var Dom = YAHOO.util.Dom;
-            var label = document.createElement('label');
-            label.innerHTML = '<strong>Upload:</strong>' +
+            if(!document.getElementById('insertimage_upload')) {
+              var label = document.createElement('label');
+              label.innerHTML = '<strong>Upload:</strong>' +
               '<input type="file" id="insertimage_upload" name="' + upload_image_name +
               '" size="10" style="width: 20%"/>' +
               '<a href="#"  id="insertimage_upload_btn" style="width: 20%; margin-left: 10em;">Upload Image</a>' +
               '</label>';
 
-            var img_elem=Dom.get('insertimage_url');
-            Dom.getAncestorByTagName(img_elem, 'form').encoding = 'multipart/form-data';
-            Dom.insertAfter(label, img_elem.parentNode);
+              var img_elem=Dom.get(id+'_insertimage_url');
+              Dom.getAncestorByTagName(img_elem, 'form').encoding = 'multipart/form-data';
+              if (Dom.get(id+'_insertimage_url')) {
+                Dom.insertAfter(label, img_elem.parentNode);
+              }
+            }
                                                     
             YAHOO.util.Event.on('insertimage_upload_btn', 'click', function(ev) {
               YAHOO.util.Event.stopEvent(ev); // no default click action
@@ -38,8 +42,8 @@
                     var o = eval('('+resp+')');
                     if (o.status == 'UPLOADED') {
                       Dom.get('insertimage_upload').value = '';
-                      Dom.get('insertimage_url').value=base_path + o.image_url;
-                      Dom.get('insertimage_url').focus();
+                      Dom.get(id+'_insertimage_url').value=base_path + o.image_url;
+                      Dom.get(id+'_insertimage_url').focus();
                       Dom.get('insertimage_upload').focus();
                     }
                     else {