Index: openacs-4/packages/xowiki/www/portlets/wiki.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/portlets/Attic/wiki.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/xowiki/www/portlets/wiki.tcl 11 Feb 2006 00:57:44 -0000 1.3 +++ openacs-4/packages/xowiki/www/portlets/wiki.tcl 12 Feb 2006 01:21:38 -0000 1.4 @@ -2,19 +2,18 @@ # display a wiki page included in a different wiki page # -gustaf neumann -set folder_id [$__including_page set parent_id] -set item_id [::Generic::CrItem lookup -title $name -parent_id $folder_id] -set page [::Generic::CrItem instantiate -item_id $item_id] +set folder_id [$__including_page set parent_id] +set item_id [::Generic::CrItem lookup -title $name -parent_id $folder_id] +set page [::Generic::CrItem instantiate -item_id $item_id] $page volatile if {[::xowiki::Page incr recursion_count]<3} { set content [$page render] - set link [ad_urlencode $name] - ns_log notice "RECURSION_COUNT = [::xowiki::Page set recursion_count]" + set link [::xowiki::Page pretty_link $name] } else { set content "Recursion Limit exceeded, items are nested to deep!" } ::xowiki::Page incr recursion_count -1 #strip language prefix for title -regexp {^..:(.*)$} $name _ name \ No newline at end of file +regexp {^..:(.*)$} $name _ name