diff -Nur imageblock.bak/External.inc imageblock/External.inc
--- imageblock.bak/External.inc	2006-03-26 10:38:21.000000000 +0200
+++ imageblock/External.inc	2006-03-26 10:38:41.000000000 +0200
@@ -64,7 +64,7 @@
 	$frameIds = array();
 	$params = array('maxSize' => null);
 	foreach (array('blocks', 'show', 'itemId', 'maxSize',
-		       'linkTarget', 'itemFrame', 'albumFrame') as $key) {
+		       'linkTarget', 'itemFrame', 'albumFrame', 'link') as $key) {
 	    $tmp = GalleryUtilities::getRequestVariables($key);
 	    if (!empty($tmp)) {
 		$params[$key] = $tmp;
diff -Nur imageblock.bak/classes/ImageBlockHelper.class imageblock/classes/ImageBlockHelper.class
--- imageblock.bak/classes/ImageBlockHelper.class	2006-03-26 10:38:21.000000000 +0200
+++ imageblock/classes/ImageBlockHelper.class	2006-03-26 10:38:41.000000000 +0200
@@ -111,6 +111,9 @@
 	if (isset($params['linkTarget'])) {
 	    $ImageBlockData['linkTarget'] = $params['linkTarget'];
 	}
+	if (isset($params['link'])) {
+	    $ImageBlockData['link'] = $params['link'];
+	}
 
 	if (!empty($blocks)) {
             /* Prepare image frames, if available */
diff -Nur imageblock.bak/templates/ImageBlock.tpl imageblock/templates/ImageBlock.tpl
--- imageblock.bak/templates/ImageBlock.tpl	2006-03-26 10:38:21.000000000 +0200
+++ imageblock/templates/ImageBlock.tpl	2006-03-26 10:39:28.000000000 +0200
@@ -9,12 +9,17 @@
   {if !empty($block.title)}
     <h3> {g->text text=$block.title} </h3>
   {/if}
-
-  {capture name="link"}
-  <a href="{g->url arg1="view=core.ShowItem" arg2="itemId=`$block.id`" forceFullUrl=$ImageBlockData.forceFullUrl}" {strip}
-    {if !empty($ImageBlockData.linkTarget)}
-      target="{$ImageBlockData.linkTarget}"
-    {/if}{/strip}>
+  {if empty($ImageBlockData.link)}
+    {capture name="link"}
+    <a href="{g->url arg1="view=core.ShowItem" arg2="itemId=`$block.id`" forceFullUrl=$ImageBlockData.forceFullUrl}" {strip}
+      {if !empty($ImageBlockData.linkTarget)}
+        target="{$ImageBlockData.linkTarget}"
+      {/if}{/strip}>
+   {else}
+     {if $ImageBlockData.link != 'none'}
+       <a href="{$ImageBlockData.link}">
+     {/if}
+  {/if}
   {/capture}
   {if $block.item.canContainChildren}
     {assign var=frameType value="albumFrame"}
@@ -35,7 +40,9 @@
 		  width=$block.thumb.width height=$block.thumb.height maxSize=$maxSize}
       {$smarty.capture.link}
 	{g->image item=$imageItem image=$block.thumb id="%ID%" class="%CLASS%" maxSize=$maxSize forceFullUrl=$ImageBlockData.forceFullUrl}
-      </a>
+      {if $ImageBlockData.link !='none'} 
+        </a>
+      {/if}
     {/g->container}
   {else}
     {$smarty.capture.link}
diff -Nur imageblock.bak/templates/blocks/ImageBlock.tpl imageblock/templates/blocks/ImageBlock.tpl
--- imageblock.bak/templates/blocks/ImageBlock.tpl	2006-03-26 10:38:21.000000000 +0200
+++ imageblock/templates/blocks/ImageBlock.tpl	2006-03-26 10:38:41.000000000 +0200
@@ -7,6 +7,7 @@
 {g->callback type="imageblock.LoadImageBlock"
 	     blocks=$blocks|default:null maxSize=$maxSize|default:null
 	     itemId=$itemId|default:null linkTarget=$linkTarget|default:null
+	     link=$link|default:null
 	     useDefaults=$useDefaults|default:true
 	     showHeading=$showHeading|default:true
 	     showTitle=$showTitle|default:true showDate=$showDate|default:true