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 -N -r1.284.2.6 -r1.284.2.7
--- openacs-4/packages/xowiki/tcl/form-field-procs.tcl	22 Apr 2019 10:42:11 -0000	1.284.2.6
+++ openacs-4/packages/xowiki/tcl/form-field-procs.tcl	8 May 2019 14:33:40 -0000	1.284.2.7
@@ -888,7 +888,7 @@
       #
     }
 
-    set file_object [$package_id get_page_from_name -name $object_name -parent_id $parent_id]
+    set file_object [::$package_id get_page_from_name -name $object_name -parent_id $parent_id]
     if {$file_object ne ""} {
       #
       # File entry exists already, create a new revision
@@ -918,7 +918,7 @@
       # When produduction_mode is set, make sure, the new file object
       # is not in a published state.
       #
-      if {[$package_id get_parameter production_mode 0]} {
+      if {[::$package_id get_parameter production_mode 0]} {
         $file_object publish_status "production"
       }
       $file_object save_new {*}$save_flag
@@ -1046,7 +1046,7 @@
           revision_id [:get_from_value ${:value} revision_id ""] \
           fn $fns {
             #:msg "${:name}: [list :get_from_value <${:value}> name] => '$fn'"
-            set href [$package_id pretty_link -download 1 -parent_id $entry_info(parent_id) $object_name]
+            set href [::$package_id pretty_link -download 1 -parent_id $entry_info(parent_id) $object_name]
 
             if {![:istype image]} {
               append href ?filename=[ns_urlencode $fn]
@@ -1102,9 +1102,9 @@
     #
     # Get the file object of the imported file to obtain is full name and path
     #
-    set file_id [$package_id lookup -parent_id [${:object} item_id] -name $(name)]
+    set file_id [::$package_id lookup -parent_id [${:object} item_id] -name $(name)]
     ::xo::db::CrClass get_instance_from_db -item_id $file_id
-    set full_file_name [$file_id full_file_name]
+    set full_file_name [::$file_id full_file_name]
     #
     # Call the archiver to unpack and handle the archive
     #
@@ -1117,7 +1117,7 @@
       # lead to maybe unexpected deletions of the form-page
       #
       if {[:cleanup]} {
-        set return_url [$package_id query_parameter "return_url" [$parent_id pretty_link]]
+        set return_url [::$package_id query_parameter "return_url" [::$parent_id pretty_link]]
         $package_id returnredirect [${:object} pretty_link -query [export_vars {m delete} return_url]]
       }
     }
@@ -1911,7 +1911,7 @@
         skin: '[:skin]',
         startupMode: '[:mode]',
         parent_id: '[${:object} item_id]',
-        package_url: '[$package_id package_url]',
+        package_url: '[::$package_id package_url]',
         extraPlugins: '[join [:extraPlugins] ,]',
         contentsCss: '[:contentsCss]',
         imageSelectorDialog: '[:imageSelectorDialog]',
@@ -2163,7 +2163,7 @@
         startupMode: '[:mode]',
         disableNativeSpellChecker: false,
         parent_id: '[${:object} item_id]',
-        package_url: '[$package_id package_url]',
+        package_url: '[::$package_id package_url]',
         extraPlugins: '[join [:extraPlugins] ,]',
         extraAllowedContent: '[:extraAllowedContent]',
         contentsCss: '[:contentsCss]',
@@ -2923,7 +2923,7 @@
       #
       set object_package_id [$i package_id]
       if {${:package_id} != $object_package_id} {
-        set package_prefix /[$object_package_id package_url]
+        set package_prefix /[::$object_package_id package_url]
       } else {
         set package_prefix ""
       }
@@ -2964,7 +2964,7 @@
     set :options [list]
     ::xo::dc foreach instance_select \
         [${:type} instance_select_query \
-             -folder_id [$package_id folder_id] \
+             -folder_id [::$package_id folder_id] \
              -with_subtypes ${:with_subtypes} \
              -select_attributes [list title] \
              -from_clause ", xowiki_page p" \
@@ -3251,24 +3251,25 @@
     }
     set link_type [${:object} get_property_from_link_page link_type]
     ${:object} references resolved [list $item_id $link_type]
+    set item $::item_id
 
     if {${:resolve_local}} {
       #
       # resetting esp. the item-id is dangerous.
       # Therefore we reset it immediately after the rendering
       #
       #:log "set __RESOLVE_LOCAL"
-      $item_id set __RESOLVE_LOCAL 1
-      $item_id set_resolve_context \
+      $item set __RESOLVE_LOCAL 1
+      $item set_resolve_context \
           -package_id [${:object} package_id] -parent_id [${:object} parent_id] \
           -item_id [${:object} item_id]
 
-      set html [$item_id render]
+      set html [::$item_id render]
 
-      $item_id unset __RESOLVE_LOCAL
-      $item_id reset_resolve_context
+      $item unset __RESOLVE_LOCAL
+      $item reset_resolve_context
     } else {
-      set html [$item_id render]
+      set html [$item render]
     }
     return $html
   }