Index: openacs-4/packages/acs-subsite/tcl/subsite-navigation-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/subsite-navigation-procs.tcl,v diff -u -r1.5.2.1 -r1.5.2.2 --- openacs-4/packages/acs-subsite/tcl/subsite-navigation-procs.tcl 16 May 2019 09:27:52 -0000 1.5.2.1 +++ openacs-4/packages/acs-subsite/tcl/subsite-navigation-procs.tcl 21 Jul 2020 14:08:50 -0000 1.5.2.2 @@ -95,7 +95,7 @@ } array set subsection_a $subsection_spec set subsection_a(name) $subsection_name - set subsection_a(folder) [file join $section_a(folder) $subsection_a(folder)] + set subsection_a(folder) [ad_file join $section_a(folder) $subsection_a(folder)] add_section_row \ -subsite_id $subsite_id \ @@ -144,7 +144,7 @@ set current_url [string range [ad_conn url] [string length $base_url] end] } - set info(url) [file join $info(folder) $info(url)] + set info(url) [ad_file join $info(folder) $info(url)] regsub {\.$} $info(url) "" info(url) # Default to not selected @@ -158,7 +158,7 @@ set selected_p 1 } else { foreach pattern $info(selected_patterns) { - set full_pattern [file join $info(folder) $pattern] + set full_pattern [ad_file join $info(folder) $pattern] if { [string match $full_pattern $current_url] } { set selected_p 1 break @@ -173,7 +173,7 @@ set navigation_id "" } - set joined_url [file join $base_url $info(url)] + set joined_url [ad_file join $base_url $info(url)] if {[string index $info(url) end] eq "/"} { append joined_url / }