Index: openacs-4/packages/acs-subsite/acs-subsite.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/acs-subsite.info,v
diff -u -N -r1.127 -r1.128
--- openacs-4/packages/acs-subsite/acs-subsite.info	2 Aug 2018 09:27:28 -0000	1.127
+++ openacs-4/packages/acs-subsite/acs-subsite.info	15 Sep 2018 09:46:20 -0000	1.128
@@ -9,7 +9,7 @@
     <implements-subsite-p>t</implements-subsite-p>
     <inherit-templates-p>t</inherit-templates-p>
 
-    <version name="5.10.0d6" url="http://openacs.org/repository/download/apm/acs-subsite-5.10.0d6.apm">
+    <version name="5.10.0d7" url="http://openacs.org/repository/download/apm/acs-subsite-5.10.0d7.apm">
         <owner url="http://openacs.org">OpenACS</owner>
         <summary>Subsite</summary>
         <release-date>2017-08-06</release-date>
@@ -18,11 +18,11 @@
         <license>GPL</license>
         <maturity>3</maturity>
 
-        <provides url="acs-subsite" version="5.10.0d6"/>
+        <provides url="acs-subsite" version="5.10.0d7"/>
         <requires url="acs-authentication" version="5.9.1"/>
         <requires url="acs-content-repository" version="5.9.1"/>
         <requires url="acs-kernel" version="5.9.1"/>
-        <requires url="acs-tcl" version="5.10.0d8"/>
+        <requires url="acs-tcl" version="5.10.0d20"/>
         <requires url="acs-lang" version="5.9.1"/>
         <requires url="acs-mail-lite" version="5.9.1"/>
 
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:
Index: openacs-4/packages/acs-tcl/acs-tcl.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/acs-tcl.info,v
diff -u -N -r1.91 -r1.92
--- openacs-4/packages/acs-tcl/acs-tcl.info	13 Sep 2018 06:20:36 -0000	1.91
+++ openacs-4/packages/acs-tcl/acs-tcl.info	15 Sep 2018 09:46:20 -0000	1.92
@@ -9,7 +9,7 @@
     <implements-subsite-p>f</implements-subsite-p>
     <inherit-templates-p>t</inherit-templates-p>
     
-    <version name="5.10.0d19" url="http://openacs.org/repository/download/apm/acs-tcl-5.10.0d19.apm">
+    <version name="5.10.0d20" url="http://openacs.org/repository/download/apm/acs-tcl-5.10.0d20.apm">
         <owner url="http://openacs.org">OpenACS</owner>
         <summary>The Kernel Tcl API library.</summary>
         <release-date>2017-08-06</release-date>
@@ -18,7 +18,7 @@
         <license>GPL version 2</license>
         <maturity>3</maturity>
 
-        <provides url="acs-tcl" version="5.10.0d19"/>
+        <provides url="acs-tcl" version="5.10.0d20"/>
         <requires url="acs-bootstrap-installer" version="5.10.0d4"/>
         <requires url="acs-kernel" version="5.10.0d0"/>