Index: openacs-4/packages/acs-subsite/tcl/subsite-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/subsite-procs.tcl,v
diff -u -r1.63 -r1.64
--- openacs-4/packages/acs-subsite/tcl/subsite-procs.tcl	28 Nov 2018 16:41:45 -0000	1.63
+++ openacs-4/packages/acs-subsite/tcl/subsite-procs.tcl	28 Nov 2018 16:47:38 -0000	1.64
@@ -783,7 +783,10 @@
 ad_proc -public subsite::get_theme_options {} {
     Gets options for subsite themes for use with a form builder select widget.
 } {
-    db_foreach get_subsite_themes {} {
+    db_foreach get_subsite_themes {
+        select name, key
+        from subsite_themes
+    } {
         lappend master_theme_options [list [lang::util::localize $name] $key]
     }
 
Index: openacs-4/packages/acs-subsite/tcl/subsite-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/Attic/subsite-procs.xql,v
diff -u -r1.15 -r1.16
--- openacs-4/packages/acs-subsite/tcl/subsite-procs.xql	28 Nov 2018 16:02:40 -0000	1.15
+++ openacs-4/packages/acs-subsite/tcl/subsite-procs.xql	28 Nov 2018 16:47:38 -0000	1.16
@@ -18,13 +18,6 @@
         </querytext>
     </partialquery>
 
-  <fullquery name="subsite::get_theme_options.get_subsite_themes">
-    <querytext>
-      select name, key
-      from subsite_themes
-    </querytext>
-  </fullquery>
-  
   <fullquery name="subsite::new_subsite_theme.insert_subsite_theme">
     <querytext>
       insert into subsite_themes