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 -N -r1.8 -r1.9 --- openacs-4/packages/xowiki/tcl/link-procs.tcl 6 Aug 2006 19:57:09 -0000 1.8 +++ openacs-4/packages/xowiki/tcl/link-procs.tcl 9 Aug 2006 00:37:52 -0000 1.9 @@ -13,7 +13,7 @@ # Class create Link -parameter { - type name lang stripped_name label + type name lang stripped_name label page folder_id package_id } Link instproc init {} { @@ -32,7 +32,7 @@ return " \[ $label \] " } Link instproc render {} { - set page [my info parent] + set page [my page] set item_id [my resolve] #my log "--u resolve returns $item_id" if {$item_id} { @@ -79,7 +79,7 @@ Class create ::xowiki::Link::language -superclass ::xowiki::Link ::xowiki::Link::language instproc render {} { - set page [my info parent] + set page [my page] my instvar lang name package_id set item_id [my resolve] if {$item_id} { @@ -105,10 +105,12 @@ Class create ::xowiki::Link::image -superclass ::xowiki::Link ::xowiki::Link::image instproc render {} { my instvar name package_id label - set page [my info parent] + set page [my page] set item_id [my resolve] if {$item_id} { - set link [export_vars -base [::xowiki::Page pretty_link $name] {{m download}} ] + set base [::xowiki::Page pretty_link -absolute [$page absolute_links] $name] +my log "--l fully quali [$page absolute_links], base=$base" + set link [export_vars -base $base {{m download}} ] $page lappend references [list $item_id [my type]] my render_found $link $label } else { @@ -184,4 +186,4 @@ } Link instmixin add LinkCache -} \ No newline at end of file +}