Index: openacs-4/packages/acs-content-repository/tcl/content-keyword-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/tcl/content-keyword-procs.tcl,v diff -u -r1.6 -r1.6.2.1 --- openacs-4/packages/acs-content-repository/tcl/content-keyword-procs.tcl 15 Aug 2018 16:24:28 -0000 1.6 +++ openacs-4/packages/acs-content-repository/tcl/content-keyword-procs.tcl 13 Mar 2019 10:11:27 -0000 1.6.2.1 @@ -253,11 +253,12 @@ } { Returns a flat options list of the keywords with the given parent_id. } { - return [db_list_of_lists select_keyword_options [subst { - select heading, keyword_id - from cr_keywords - where [ad_decode $parent_id "" "parent_id is null" "parent_id = :parent_id"] - order by lower(heading)}]] + return [db_list_of_lists select_keyword_options { + select heading, keyword_id + from cr_keywords + where ((:parent_id is null and parent_id is null) or parent_id = :parent_id) + order by lower(heading) + }] } ad_proc -public content::keyword::item_get_assigned {