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 -r1.66 -r1.67
--- openacs-4/packages/xowiki/tcl/link-procs.tcl	20 Apr 2009 14:05:32 -0000	1.66
+++ openacs-4/packages/xowiki/tcl/link-procs.tcl	1 Jul 2009 10:09:40 -0000	1.67
@@ -191,7 +191,7 @@
     set item_id [my resolve]
     #my log "-- image resolve for $page returned $item_id (name=$name, label=$label) "
     if {$item_id} {
-      set link [[my package_id] pretty_link -download true \
+      set link [[my package_id] pretty_link -download true -query [my query] \
                     -absolute [$page absolute_links] -parent_id [my parent_id] $name]
       #my log "--l fully quali [$page absolute_links], base=$base"
       #set link [export_vars -base $base {{m download}} ]
Index: openacs-4/packages/xowiki/tcl/package-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/package-procs.tcl,v
diff -u -r1.177 -r1.178
--- openacs-4/packages/xowiki/tcl/package-procs.tcl	29 May 2009 13:37:48 -0000	1.177
+++ openacs-4/packages/xowiki/tcl/package-procs.tcl	1 Jul 2009 10:09:40 -0000	1.178
@@ -582,7 +582,7 @@
       if {[$page procsearch $method] eq ""} {
 	return [my error_msg "Method <b>'$method'</b> is not defined for this object"]
       } else {
-        #my msg "--invoke [my set object] id=$page method=$method" 
+        #my log "--invoke [my set object] id=$page method=$method" 
         if {$batch_mode} {[my id] set __batch_mode 1}
 	set r [my call $page $method ""]
         if {$batch_mode} {[my id] unset __batch_mode}
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 -r1.362 -r1.363
--- openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	1 Jul 2009 09:12:42 -0000	1.362
+++ openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	1 Jul 2009 10:09:40 -0000	1.363
@@ -1772,7 +1772,11 @@
     my instvar name mime_type description parent_id package_id creation_user
     # don't require permissions here, such that rss can present the link
     #set page_link [$package_id make_link -privilege public [self] download ""]
-    set page_link [$package_id pretty_link -download true -parent_id [my parent_id] [my name]]
+
+    set revision_id [[$package_id context] query_parameter revision_id]
+    set query [expr {$revision_id ne "" ? "revision_id=$revision_id" : ""}]
+    set page_link [$package_id pretty_link -download true -parent_id [my parent_id] -query $query [my name]]
+
     #my log "--F page_link=$page_link ---- "
     set t [TableWidget new -volatile \
                -columns {
@@ -1797,7 +1801,7 @@
 
     if {[string match image/* $mime_type]} {
       set l [Link new -volatile \
-                 -page [self] \
+                 -page [self] -query $query \
                  -type image -name $name -lang "" \
                  -stripped_name $stripped_name -label $label \
                  -parent_id $parent_id -package_id $package_id]