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 -r1.131.2.13 -r1.131.2.14
--- openacs-4/packages/acs-subsite/acs-subsite.info	3 Mar 2020 18:38:15 -0000	1.131.2.13
+++ openacs-4/packages/acs-subsite/acs-subsite.info	3 May 2020 17:00:57 -0000	1.131.2.14
@@ -9,7 +9,7 @@
     <implements-subsite-p>t</implements-subsite-p>
     <inherit-templates-p>t</inherit-templates-p>
 
-    <version name="5.10.0d20" url="http://openacs.org/repository/download/apm/acs-subsite-5.10.0d20.apm">
+    <version name="5.10.0d21" url="http://openacs.org/repository/download/apm/acs-subsite-5.10.0d21.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.0d20"/>
+        <provides url="acs-subsite" version="5.10.0d21"/>
         <requires url="acs-authentication" version="5.10.0d5"/>
         <requires url="acs-content-repository" version="5.9.1"/>
         <requires url="acs-kernel" version="5.9.1"/>
-        <requires url="acs-tcl" version="5.10.0d31"/>
+        <requires url="acs-tcl" version="5.10.0d32"/>
         <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/themes/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/themes/index.tcl,v
diff -u -r1.3 -r1.3.2.1
--- openacs-4/packages/acs-subsite/www/admin/themes/index.tcl	11 Aug 2017 12:54:40 -0000	1.3
+++ openacs-4/packages/acs-subsite/www/admin/themes/index.tcl	3 May 2020 17:00:57 -0000	1.3.2.1
@@ -29,7 +29,7 @@
             link_url_eval {[export_vars -base view { {theme $key} }]}
             link_html { title "#acs-subsite.Edit_this_theme#" }
         }
-        
+
         key {
             label "[_ acs-subsite.Key]"
         }
@@ -93,8 +93,7 @@
 set subsite_id [ad_conn subsite_id]
 set currentThemeKey [parameter::get -parameter ThemeKey -package_id $subsite_id]
 
-set package_keys '[join [subsite::package_keys] ',']'
-
+set package_keys [subsite::package_keys]
 db_multirow -extend {active_p modified_p delete_p usage_count} themes select_themes {} {
     set active_p [expr {$currentThemeKey eq $key}]
     set modified_p [expr {$active_p && [subsite::get_theme_subsites \
@@ -105,7 +104,7 @@
         select count(*)
         from apm_parameters p, apm_parameter_values v
         where p.parameter_name = 'ThemeKey'
-        and   p.package_key in ($package_keys)
+        and   p.package_key in ([ns_dbquotelist $package_keys])
         and   p.parameter_id = v.parameter_id
         and   v.attr_value = :key
     }]]