Index: openacs-4/packages/cms/tcl/cms-folder-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cms/tcl/cms-folder-procs.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/cms/tcl/cms-folder-procs.tcl 20 Apr 2001 20:51:09 -0000 1.1 +++ openacs-4/packages/cms/tcl/cms-folder-procs.tcl 3 Jul 2001 16:37:55 -0000 1.2 @@ -40,11 +40,12 @@ # # @see proc cms_folder::flush_registered_types -proc cms_folder::get_registered_types { +ad_proc cms_folder::get_registered_types { folder_id {datasource multilist} {name registered_types} } { - set sql " + set code [list \ + template::query get_name_type $name $datasource " select o.pretty_name, m.content_type @@ -57,11 +58,7 @@ and content_item.is_subclass(o.object_type, 'content_revision') = 't' order by - decode(o.object_type, 'content_revision', '----', o.pretty_name) - " - - set code [list \ - template::query $name $datasource $sql \ + decode(o.object_type, 'content_revision', '----', o.pretty_name)" \ -cache "folder_registered_types $folder_id $datasource" -persistent \ -timeout 3600]