Index: openacs-4/packages/xowiki/tcl/upgrade/upgrade.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/upgrade/upgrade.tcl,v
diff -u -r1.15 -r1.15.2.1
--- openacs-4/packages/xowiki/tcl/upgrade/upgrade.tcl	9 Nov 2018 12:07:14 -0000	1.15
+++ openacs-4/packages/xowiki/tcl/upgrade/upgrade.tcl	8 May 2019 14:33:40 -0000	1.15.2.1
@@ -300,10 +300,10 @@
         # rename swf:name and image:name to file:name
         db_dml change_swf \
             "update cr_items set name = 'file' || substr(name,4) \
-    where name like 'swf:%' and parent_id = [$package_id folder_id]"
+    where name like 'swf:%' and parent_id = [::$package_id folder_id]"
         db_dml change_image \
             "update cr_items set name = 'file' || substr(name,6) \
-    where name like 'image:%' and parent_id = [$package_id folder_id]"
+    where name like 'image:%' and parent_id = [::$package_id folder_id]"
         # reload updated prototype pages
         $package_id import-prototype-page book
         $package_id import-prototype-page weblog
@@ -333,10 +333,10 @@
           #
           db_dml change_swf \
               "update cr_items set name = 'file' || substr(name,4) \
-    where name like 'swf:%' and parent_id = [$package_id folder_id]"
+    where name like 'swf:%' and parent_id = [::$package_id folder_id]"
           db_dml change_image \
               "update cr_items set name = 'file' || substr(name,6) \
-    where name like 'image:%' and parent_id = [$package_id folder_id]"
+    where name like 'image:%' and parent_id = [::$package_id folder_id]"
         }
       }
       catch {
@@ -499,16 +499,16 @@
 
       foreach package_id [::xowiki::Package instances] {
         ::xowiki::Package initialize -package_id $package_id
-        set item_id [$package_id lookup -name ::[$package_id folder_id]]
+        set item_id [::$package_id lookup -name ::[::$package_id folder_id]]
         if {$item_id ne 0} {
           ::xowiki::Object get_instance_from_db -item_id $item_id
-          set p [$item_id get_payload widget_specs]
+          set p [::$item_id get_payload widget_specs]
           if {$p ne ""} {
-            ns_log notice "Transferring widget_specs to parameter WidgetSpecs for $package_id [$package_id package_url]"
+            ns_log notice "Transferring widget_specs to parameter WidgetSpecs for $package_id [::$package_id package_url]"
             parameter::set_value -package_id $package_id -parameter WidgetSpecs -value $p
           }
         } else {
-          ns_log notice "no folder object found for $package_id - [$package_id package_url]"
+          ns_log notice "no folder object found for $package_id - [::$package_id package_url]"
         }
       }
     }