--- plugins/UploadImage/popups/insert_image.php.org	Thu Jun 24 07:59:14 2004
+++ plugins/UploadImage/popups/insert_image.php	Thu Jun 24 08:12:31 2004
@@ -80,11 +80,11 @@
   return false;
 };
 
-function onNodeDisplay(node) {
+function onNodeDisplay(path) {
 	document.preview.src = document.MM_p[0].src
 	var el = document.getElementById('f_url');
 	<?php $script = (strpos($_SERVER["SERVER_SOFTWARE"], "Apache") === false) ? "index.php" : "";?>
-	el.value = document.base_url+"/<?php if (variable_get("clean_url", "0") == "0") { ?><?php echo $script ?>?q=<?php } ?>image/view/"+node;
+	el.value = document.base_url+"/"+path;
 	document.preview.src = el.value+"?res=300x200";
 };
 
@@ -167,10 +167,10 @@
               <legend>Images</legend> 
               <select name="nodes_list" size="20" id="nodes_list" style="width:15em " onChange="onNodeDisplay(this.value)">
                 <?php 
-									$result = db_query("SELECT n.nid, n.title FROM {node} n INNER JOIN {term_node} r ON n.nid = r.nid WHERE r.tid IN ('$tid') AND n.status = '1' AND n.type = 'image' ORDER BY static DESC, created DESC");
+									$result = db_query("SELECT n.nid, i.image_path, n.title FROM {node} n INNER JOIN {term_node} r ON n.nid = r.nid INNER JOIN {image} i ON n.nid = i.nid WHERE r.tid IN ('$tid') AND n.status = '1' AND n.type = 'image' ORDER BY static DESC, created DESC");
 									while($node = db_fetch_object($result)) {
 								?>
-								<option value="<?php echo $node->nid ?>"><?php echo $node->title ?></option>
+								<option value="<?php echo $node->image_path ?>"><?php echo $node->title ?></option>
 								<?php } ?>
               </select>
             </fieldset></td>