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.248 -r1.249
--- openacs-4/packages/xowiki/tcl/form-field-procs.tcl	16 Jun 2015 19:49:20 -0000	1.248
+++ openacs-4/packages/xowiki/tcl/form-field-procs.tcl	12 Aug 2015 15:17:37 -0000	1.249
@@ -2991,19 +2991,18 @@
       # 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]"
+      #my log "set __RESOLVE_LOCAL"
+      $item_id set __RESOLVE_LOCAL 1
       $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]
-    
-    if {$resolve_local} {
-      my log "reset resolve-context"
+      
+      set html [$item_id render]
+      
+      $item_id unset __RESOLVE_LOCAL
       $item_id reset_resolve_context
+    } else {
+      set html [$item_id render]
     }
     return $html
   }