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 -r1.32.2.3 -r1.32.2.4
--- openacs-4/packages/acs-tcl/tcl/navigation-procs.tcl	2 Jan 2016 20:42:58 -0000	1.32.2.3
+++ openacs-4/packages/acs-tcl/tcl/navigation-procs.tcl	26 Feb 2016 10:12:45 -0000	1.32.2.4
@@ -286,7 +286,8 @@
 ad_proc -public util_current_location_node_id { } {
     returns node_id of util_current_location. Useful for hostnode mapped sites using ad_context_bar
 } {
-    regexp {^([a-z]+://)?([^:]+)(:[0-9]*)?$} [util_current_location] match location_proto location_hostname location_port
+    util::split_location [util_current_location] .proto location_hostname .port
+
     if { [string match -nocase "www.*" $location_hostname] } {
         set location_hostname [string range $location_hostname 4 end]
     }