Index: openacs-4/packages/xowiki/tcl/form-field-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/form-field-procs.tcl,v
diff -u -r1.243 -r1.244
--- openacs-4/packages/xowiki/tcl/form-field-procs.tcl	28 Apr 2015 09:30:17 -0000	1.243
+++ openacs-4/packages/xowiki/tcl/form-field-procs.tcl	7 Jun 2015 13:05:52 -0000	1.244
@@ -2963,8 +2963,9 @@
   # note that the includelet "include" can be used for implementing symbolic links
   # to other xowiki pages.
   Class create include -superclass text -parameter {
+    {resolve_local false}
   }
-
+  
   include instproc pretty_value {v} {
     if {$v eq ""} { return $v }
 
@@ -2980,16 +2981,26 @@
     set link_type [$object get_property_from_link_page link_type]
     $object references resolved [list $item_id $link_type]
 
-    #
-    # resetting esp. the item-id is dangerous. Therefore we reset it immediately after the rendering
-    #
-    $item_id set_resolve_context \
-        -package_id [$object package_id] -parent_id [$object parent_id] \
-        -item_id [$object item_id]
+    set resolve_local [my resolve_local]
+    if {$resolve_local} {
+      #
+      # resetting esp. the item-id is dangerous.
+      # Therefore we reset it immediately after the rendering
+      #
+      
+      my log "set_resolve_context -package_id [$object package_id] -parent_id [$object parent_id] \
+        -item_id [$object item_id]"
+      $item_id set_resolve_context \
+          -package_id [$object package_id] -parent_id [$object parent_id] \
+          -item_id [$object item_id]
+    }
+    
     set html [$item_id render]
-    #my msg "reset resolve-context"
-    $item_id reset_resolve_context
-
+    
+    if {$resolve_local} {
+      my log "reset resolve-context"
+      $item_id reset_resolve_context
+    }
     return $html
   }