Index: image_filter/image_filter.info
===================================================================
--- image_filter/image_filter.info	(revision 0)
+++ image_filter/image_filter.info	(revision 43)
@@ -0,0 +1,7 @@
+; $Id$
+name = Image Filter
+description = Allow users to reference images from other nodes.
+package = Image
+version = $Name$
+dependencies = image
+
Index: image_filter/image_filter.module
===================================================================
--- image_filter/image_filter.module	(revision 39)
+++ image_filter/image_filter.module	(working copy)
@@ -19,10 +19,6 @@
 }
 
 function image_filter_help($section = 'admin/help#image_filter') {
-  if (module_exist('image_filter') && !module_exist('image')) {
-    drupal_set_message(t('The image_filter module relies on image.module. Please go to the <a href="%modules">modules</a> section of administration to turn on image.module.', array('%modules' => url('admin/modules'))));
-  }
-
   $output = '';
   switch ($section) {
     case 'admin/help#image_filter':
@@ -184,10 +180,11 @@
       $img->class = image_filter_attr_value($args['class'], IMAGE_FILTER_WORD);
       $img->style = image_filter_attr_value($args['style'], IMAGE_FILTER_STRING);
       $linkid = image_filter_attr_value($args['node'], IMAGE_FILTER_INTEGER);
-      $img->link = $args['nolink'] ? NULL :
-                   $linkid         ? "node/$linkid" :
-                                     "node/$img->nid";
-
+      if ($args['nolink']) {
+        $img->link = NULL;
+      } else {
+        $img->link = $linkid ? "node/$linkid" : "node/$img->nid";
+      }
       $img_tag = theme("image_inline_img", $img);
       $text = str_replace($match[0], $img_tag, $text);
     }