Index: openacs-4/packages/acs-subsite/www/admin/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/index.tcl,v
diff -u -N -r1.21 -r1.22
--- openacs-4/packages/acs-subsite/www/admin/index.tcl	27 Jan 2018 16:19:08 -0000	1.21
+++ openacs-4/packages/acs-subsite/www/admin/index.tcl	15 Sep 2018 09:46:20 -0000	1.22
@@ -21,9 +21,21 @@
 set acs_admin_url [apm_package_url_from_key "acs-admin"]
 array set acs_admin_node [site_node::get -url $acs_admin_url]
 set acs_admin_name $acs_admin_node(instance_name)
-set sw_admin_p [permission::permission_p -party_id [ad_conn user_id] -object_id $acs_admin_node(object_id) -privilege admin]
-set full_acs_admin_url [util::configured_location]$acs_admin_url
+set sw_admin_p [permission::permission_p \
+                    -party_id [ad_conn user_id] \
+                    -object_id $acs_admin_node(object_id) \
+                    -privilege admin]
 
+#
+# Get the main site location, which is the configured location.
+# When SuppressHttpPort is set, get it without the port.
+#
+set suppress_port [parameter::get -parameter SuppressHttpPort \
+                       -package_id [apm_package_id_from_key acs-tcl] \
+                       -default 0]
+set main_site_location [util::configured_location -suppress_port=$suppress_port]
+set full_acs_admin_url $main_site_location$acs_admin_url
+
 set convert_subsite_p [expr { [llength [apm::get_package_descendent_options [ad_conn package_key]]] > 0 }]
 
 # Local variables: