Index: openacs-4/packages/acs-tcl/tcl/navigation-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/navigation-procs.tcl,v
diff -u -N -r1.32.2.9 -r1.32.2.10
--- openacs-4/packages/acs-tcl/tcl/navigation-procs.tcl	8 Feb 2017 11:05:41 -0000	1.32.2.9
+++ openacs-4/packages/acs-tcl/tcl/navigation-procs.tcl	14 Feb 2017 20:07:27 -0000	1.32.2.10
@@ -39,8 +39,9 @@
     }
 
     set out {}
-    foreach element [lrange $context 0 [llength $context]-2] { 
-        append out [subst {<a href="[ns_quotehtml [lindex $element 0]]">[ns_quotehtml [lindex $element 1]]</a> $separator }]
+    foreach element [lrange $context 0 [llength $context]-2] {
+        lassign $element href label
+        append out [subst {<a href="[ns_quotehtml $href]">[ns_quotehtml $label]</a> $separator }]
     }
     append out [ns_quotehtml [lindex $context end]]
 
@@ -63,7 +64,7 @@
 
     while { $node_id ne "" } {        
         array set node [site_node::get -node_id $node_id]
-        
+
         # JCD: Provide something for the name if the instance name is
         # absent.  name is the tail bit of the url which seems like a
         # reasonable thing to display.
@@ -72,7 +73,7 @@
             set node(instance_name) $node(name)
         }
 
-        # don't collect link for nodes without an object underneath
+        # Don't collect link for nodes without an object underneath
         # (e.g. empty site folders), as they would just be dead links
         if {$node(object_id) ne ""} {
             set context [list [list $node(url) [ns_quotehtml $node(instance_name)]] {*}$context]
@@ -82,7 +83,7 @@
         if {$node_id eq $from_node} {
             break
         }
-        
+
         set node_id $node(parent_id)
     }