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.117.2.29 -r1.117.2.30
--- openacs-4/packages/acs-subsite/acs-subsite.info	27 Feb 2017 07:42:03 -0000	1.117.2.29
+++ openacs-4/packages/acs-subsite/acs-subsite.info	4 Mar 2017 10:57:08 -0000	1.117.2.30
@@ -134,7 +134,7 @@
             <parameter scope="instance" datatype="text"  min_n_values="1"  max_n_values="1"  name="ThemeJS"  default=""
 		       description="A list of lists of JS specifications of the form '-attribute value' pairs to use with this theme. The allowed attributes are defined by the arguments of template::add_script.  Set by the admin theme-switching UI." section_name="theming"/>
             <parameter scope="instance" datatype="string"  min_n_values="1"  max_n_values="1"  name="ThemeKey"  default="default_plain" description="Key of the acs-templating theme for this subsite.  Set by the admin theme-switching UI." section_name="theming"/>
-            <parameter scope="instance" datatype="string"  min_n_values="1"  max_n_values="1"  name="TmpDir"  default="/tmp /var/tmp" description="What tmp directories are used on this system? Note the leading / character."/>
+            <parameter scope="instance" datatype="string"  min_n_values="1"  max_n_values="1"  name="TmpDir"  default="" description="What tmp directories are used on this system? Could be something like '/tmp /var/tmp', note the leading / character. If this value is empty, 'ns_config ns/parameters tmpdir' is used"/>
             <parameter scope="instance" datatype="string"  min_n_values="1"  max_n_values="1"  name="UserHomeTemplate"  default="/packages/acs-subsite/lib/home" description="Name of the template used for the user home page" section_name="Templates"/>
             <parameter scope="instance" datatype="string"  min_n_values="1"  max_n_values="1"  name="UserInfoTemplate"  default="/packages/acs-subsite/lib/user-info" description="Name of the template used for description of a user" section_name="Templates"/>
             <parameter scope="instance" datatype="text"  min_n_values="1"  max_n_values="1"  name="UserNavbarTabsList"  default="home {label #acs-subsite.Subsite_Home#}" description="Navigation tabs to show to users" section_name="Navigation Tabs"/>
Index: openacs-4/packages/acs-tcl/tcl/tcl-documentation-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/tcl-documentation-procs.tcl,v
diff -u -N -r1.36.2.33 -r1.36.2.34
--- openacs-4/packages/acs-tcl/tcl/tcl-documentation-procs.tcl	24 Feb 2017 18:23:39 -0000	1.36.2.33
+++ openacs-4/packages/acs-tcl/tcl/tcl-documentation-procs.tcl	4 Mar 2017 10:57:08 -0000	1.36.2.34
@@ -1749,7 +1749,7 @@
     # check to make sure path is to an authorized directory
     set tmpdir_list [ad_parameter_all_values_as_list -package_id [ad_conn subsite_id] TmpDir]
     if { $tmpdir_list eq "" } {
-        set tmpdir_list [list "/var/tmp" "/tmp" [ns_config ns/parameters tmpdir]]
+        set tmpdir_list [list [ns_config ns/parameters tmpdir] "/var/tmp" "/tmp"]
     }
 
     foreach tmpdir $tmpdir_list {
Index: openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl,v
diff -u -N -r1.140.2.60 -r1.140.2.61
--- openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl	1 Mar 2017 13:59:52 -0000	1.140.2.60
+++ openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl	4 Mar 2017 10:57:08 -0000	1.140.2.61
@@ -167,9 +167,9 @@
         set passed_check_p 0
 
         # check to make sure path is to an authorized directory
-        set tmpdir_list [ad_parameter_all_values_as_list TmpDir]
+        set tmpdir_list [ad_parameter_all_values_as_list -package_id [ad_conn subsite_id] TmpDir]
         if { $tmpdir_list eq "" } {
-            set tmpdir_list [list "/var/tmp" "/tmp"]
+            set tmpdir_list [list [ns_config ns/parameters tmpdir] "/var/tmp" "/tmp"]
         }
 
         foreach tmpdir $tmpdir_list {