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 -N -r1.96.2.3 -r1.96.2.4
--- openacs-4/packages/xowiki/tcl/link-procs.tcl	22 Oct 2015 08:29:55 -0000	1.96.2.3
+++ openacs-4/packages/xowiki/tcl/link-procs.tcl	29 Oct 2015 19:43:33 -0000	1.96.2.4
@@ -60,6 +60,7 @@
   Class create Link -superclass BaseLink -parameter {
     {type link} name lang stripped_name page 
     parent_id package_id item_id {form ""} revision_id
+    is_self_link
   }
   Link instproc init {} {
     my instvar page name
Index: openacs-4/packages/xowiki/tcl/xowiki-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-procs.tcl,v
diff -u -N -r1.485.2.15 -r1.485.2.16
--- openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	22 Oct 2015 08:28:42 -0000	1.485.2.15
+++ openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	29 Oct 2015 19:43:34 -0000	1.485.2.16
@@ -2135,6 +2135,7 @@
 
     # we might consider make this configurable
     set use_package_path true
+    set is_self_link false
     
     if {[regexp {^:(..):(.+)$} $(link) _ lang stripped_name]} {
       # we found a language link (it starts with a ':')
@@ -2151,6 +2152,7 @@
       # resource (e.g. the image name) under the current (physical)
       # item.
       #
+      set is_self_link true
       set package_id [my physical_package_id]
       array set "" [$package_id item_ref \
                         -use_package_path $use_package_path \
@@ -2180,7 +2182,8 @@
         -type $(link_type) [list -name $item_name] -lang $(prefix) \
         [list -anchor $(anchor)] [list -query $(query)] \
         [list -stripped_name $(stripped_name)] [list -label $label] \
-        -parent_id $(parent_id) -item_id $(item_id) -package_id $package_id
+        -parent_id $(parent_id) -item_id $(item_id) -package_id $package_id \
+        -is_self_link $is_self_link
 
     # in case, we can't link, flush the href
     if {[my can_link $(item_id)] == 0} {
@@ -2252,7 +2255,7 @@
     }
     if {$l eq ""} {return ""}
 
-    if {[my exists __RESOLVE_LOCAL]} {
+    if {[my exists __RESOLVE_LOCAL] && [$l is_self_link]} {
       my set_resolve_context -package_id [my physical_package_id] -parent_id [my physical_parent_id]
       $l parent_id [my anchor_parent_id]
       set html [$l render]