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 -N -r1.5 -r1.5.2.1
--- openacs-4/packages/acs-subsite/tcl/subsite-navigation-procs.tcl	30 Jun 2018 21:08:42 -0000	1.5
+++ openacs-4/packages/acs-subsite/tcl/subsite-navigation-procs.tcl	16 May 2019 09:27:52 -0000	1.5.2.1
@@ -1,5 +1,3 @@
-# /packages/subsite/tcl/subsite-procs.tcl
-
 ad_library {
 
     Procs to manage the default template's navigation multirow.
@@ -134,8 +132,8 @@
      } {
         set info(url) "[string range $info(url) 0 [string last / $info(url)]]."
     }
-    
-    if { [ad_conn node_id] == 
+
+    if { [ad_conn node_id] ==
          [site_node::closest_ancestor_package -include_self \
             -node_id [site_node::get_node_id_from_object_id -object_id $subsite_id] \
             -package_key [subsite::package_keys] \
@@ -145,7 +143,7 @@
         # Need to prepend the path from the subsite to this package
         set current_url [string range [ad_conn url] [string length $base_url] end]
     }
-    
+
     set info(url) [file join $info(folder) $info(url)]
     regsub {\.$} $info(url) "" info(url)
 
@@ -169,7 +167,7 @@
     }
 
     # DRB: Expr thinks "-" is a subtraction operator thus this caveman if...
-    if { $selected_p } { 
+    if { $selected_p } {
         set navigation_id ${group}-navigation-active
     } else {
         set navigation_id ""
@@ -179,7 +177,7 @@
     if {[string index $info(url) end] eq "/"} {
         append joined_url /
     }
-    
+
     template::multirow append $multirow \
         $group $info(label) $joined_url \
         "" $info(title) "" $info(accesskey) "" $navigation_id [template::multirow size $multirow] \
@@ -254,7 +252,7 @@
     if {$subsite_id eq ""} {
         set subsite_id [ad_conn subsite_id]
     }
-    
+
     set pageflow $initial_pageflow
     set subsite_node_id [site_node::get_node_id_from_object_id -object_id $subsite_id]
     set subsite_url [site_node::get_element -node_id $subsite_node_id -element url]
@@ -279,13 +277,13 @@
     }
 
     if { $show_applications_p } {
-    
+
     set index_redirect_url [parameter::get -parameter "IndexRedirectUrl" -package_id $subsite_id]
     set index_internal_redirect_url [parameter::get -parameter "IndexInternalRedirectUrl" -package_id $subsite_id]
     regsub {(.*)/packages} $index_internal_redirect_url "" index_internal_redirect_url
     regexp {(/[-[:alnum:]]+/)(.*)$} $index_internal_redirect_url dummy index_internal_redirect_url
     set child_urls [lsort -ascii [site_node::get_children -node_id $subsite_node_id -package_type apm_application]]
-    
+
         foreach child_url $child_urls {
             array set child_node [site_node::get_from_url -exact -url $child_url]
             if { $child_url ne $index_redirect_url  &&