Index: openacs-4/packages/xowiki/tcl/link-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/link-procs.tcl,v
diff -u -r1.52 -r1.53
--- openacs-4/packages/xowiki/tcl/link-procs.tcl	3 Oct 2008 11:28:16 -0000	1.52
+++ openacs-4/packages/xowiki/tcl/link-procs.tcl	10 Oct 2008 23:49:42 -0000	1.53
@@ -97,14 +97,19 @@
       my render_found $href [my label]
     } else {
       $page incr unresolved_references
-      set object_type [[$page info class] set object_type]
-      if {$object_type ne "::xowiki::Page" && $object_type ne "::xowiki::PlainPage"} {
-        # TODO: this is a temporary solution. we should find a way to
-        # pass similar to file or image entries the type of this
-        # entry. Maybe we can get the type as well from a kind of
-        # blackboard, where the type of the "edit" wiki-menu-entry is
-        # stored as well.
-        set object_type ::xowiki::Page
+      if {[$page exists __unresolved_object_type]} {
+	# get the desired object_type for unresoved entries
+	set object_type [$page set __unresolved_object_type]
+      } else {
+	set object_type [[$page info class] set object_type]
+	if {$object_type ne "::xowiki::Page" && $object_type ne "::xowiki::PlainPage"} {
+	  # TODO: this is a temporary solution. we should find a way to
+	  # pass similar to file or image entries the type of this
+	  # entry. Maybe we can get the type as well from a kind of
+	  # blackboard, where the type of the "edit" wiki-menu-entry is
+	  # stored as well.
+	  set object_type ::xowiki::Page
+	}
       }
       set name [my name]
       set title [my label]