Index: openacs-4/packages/acs-lang/tcl/lang-message-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/tcl/lang-message-procs.tcl,v
diff -u -N -r1.68.2.2 -r1.68.2.3
--- openacs-4/packages/acs-lang/tcl/lang-message-procs.tcl	1 Mar 2019 14:10:18 -0000	1.68.2.2
+++ openacs-4/packages/acs-lang/tcl/lang-message-procs.tcl	5 Mar 2019 09:36:26 -0000	1.68.2.3
@@ -538,23 +538,13 @@
 
     @author Peter Marklund
 } {
-    # Build any package and locale where clauses
-    set where_clauses [list]
-    foreach col {package_key locale} {
-        if { [set $col] ne "" } {
-            lappend where_clauses "$col = :${col}"
-        }
-    }
-    if {[llength $where_clause] > 0} {
-        set where_clause "and [join $where_clauses \" and \"]"
-    }
-
-    return [db_string conflict_count "
+    return [db_string conflict_count {
         select count(*)
         from lang_messages
         where conflict_p = 't'
-        $where_clause
-    "]
+          and (:package_key is null or :package_key = package_key)
+          and (:locale      is null or :locale      = locale)
+    }]
 }
 
 ad_proc -private lang::message::remove_from_cache {