Index: openacs-4/packages/acs-admin/tcl/apm-admin-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/tcl/apm-admin-procs.tcl,v
diff -u -N -r1.32.2.5 -r1.32.2.6
--- openacs-4/packages/acs-admin/tcl/apm-admin-procs.tcl	4 Feb 2021 12:20:03 -0000	1.32.2.5
+++ openacs-4/packages/acs-admin/tcl/apm-admin-procs.tcl	17 Feb 2021 08:20:57 -0000	1.32.2.6
@@ -21,7 +21,7 @@
         lappend section_list [list $package_key $package_key [list "where" "section_name is null"]]
         foreach section $sections {
             if { $section ne "" } {
-                lappend section_list [list $section $section [list "where" "section_name = '[db_quote $section]'"]]
+                lappend section_list [list $section $section [list "where" "section_name = [ns_dbquotevalue $section]"]]
             }
         }
         lappend section_list [list all "All" [list]]
Index: openacs-4/packages/acs-subsite/tcl/plpgsql-utility-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/plpgsql-utility-procs.tcl,v
diff -u -N -r1.11.2.1 -r1.11.2.2
--- openacs-4/packages/acs-subsite/tcl/plpgsql-utility-procs.tcl	16 May 2019 09:27:52 -0000	1.11.2.1
+++ openacs-4/packages/acs-subsite/tcl/plpgsql-utility-procs.tcl	17 Feb 2021 08:20:57 -0000	1.11.2.2
@@ -75,7 +75,7 @@
             } elseif { $arg_default eq "" || $arg_default eq "null"} {
                 lappend pieces "NULL"
             } elseif { [string tolower $arg_default] ni $reserved_default_values } {
-                lappend pieces "'[db_quote $arg_default]'"
+                lappend pieces [ns_dbquotevalue $arg_default]
             } else {
                 lappend pieces $arg_default
             }
Index: openacs-4/packages/acs-tcl/tcl/01-database-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/Attic/01-database-procs.tcl,v
diff -u -N -r1.1.2.21 -r1.1.2.22
--- openacs-4/packages/acs-tcl/tcl/01-database-procs.tcl	1 Feb 2021 10:51:08 -0000	1.1.2.21
+++ openacs-4/packages/acs-tcl/tcl/01-database-procs.tcl	17 Feb 2021 08:20:57 -0000	1.1.2.22
@@ -318,8 +318,13 @@
     return ""
 }
 
-ad_proc -public db_quote { string } {
-    Quotes a string value to be placed in a SQL statement.
+ad_proc -deprecated db_quote { string } {
+    
+    Quotes a string value to be placed in a SQL statement.  Use the
+    built-in ns_dbquotevalue instead, which cares also about the
+    surrounding quotes.
+    
+    @see ns_dbquotevalue
 } {
     regsub -all -- {'} "$string" {''} result
     return $result
Index: openacs-4/packages/search/tcl/extra-args-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/search/tcl/extra-args-procs.tcl,v
diff -u -N -r1.2 -r1.2.2.1
--- openacs-4/packages/search/tcl/extra-args-procs.tcl	7 Aug 2017 23:48:29 -0000	1.2
+++ openacs-4/packages/search/tcl/extra-args-procs.tcl	17 Feb 2021 08:20:57 -0000	1.2.2.1
@@ -19,7 +19,7 @@
     if {$object_table_alias eq "" || ![info exists object_table_alias] || $value eq ""} {
         return [list]
     }
-    return [list from_clause {} where_clause "$object_table_alias.object_type = '[db_quote $value]'"]
+    return [list from_clause {} where_clause "$object_table_alias.object_type = [ns_dbquotevalue $value]"]
 
 }