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.67 -r1.68
--- openacs-4/packages/acs-lang/tcl/lang-message-procs.tcl	22 Nov 2018 17:03:35 -0000	1.67
+++ openacs-4/packages/acs-lang/tcl/lang-message-procs.tcl	6 Dec 2018 20:06:00 -0000	1.68
@@ -869,23 +869,20 @@
     return $message
 }
 
-ad_proc -private lang::message::cache {
-    {-package_key {}}
-} {
+ad_proc -private lang::message::cache {} {
     Loads the entire message catalog from the database into the cache.
 } {
     # We segregate messages by language. It might reduce contention
     # if we segregate instead by package. Check for problems with ns_info locks.
 
     if {[nsv_incr lang_message_cache executed_p] == 1} {
-        if { $package_key eq "" } {
-            set package_where_clause ""
-        } else {
-            set package_where_clause "where package_key = :package_key"
-        }
 
         set i 0
-        db_foreach select_locale_keys {} {
+        db_foreach select_locale_keys {
+            select locale, package_key, message_key, message 
+            from   lang_messages
+            where deleted_p = 'f'
+        } {
             nsv_set lang_message_$locale "${package_key}.${message_key}" $message
             incr i
         }
Index: openacs-4/packages/acs-lang/tcl/lang-message-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/tcl/lang-message-procs.xql,v
diff -u -N -r1.10 -r1.11
--- openacs-4/packages/acs-lang/tcl/lang-message-procs.xql	16 Nov 2017 13:05:50 -0000	1.10
+++ openacs-4/packages/acs-lang/tcl/lang-message-procs.xql	6 Dec 2018 20:06:00 -0000	1.11
@@ -55,14 +55,6 @@
     </querytext>
   </fullquery>
 
-  <fullquery name="lang::message::cache.select_locale_keys">
-    <querytext>
-      select locale, package_key, message_key, message 
-      from   lang_messages
-      $package_where_clause
-    </querytext>
-  </fullquery>
-
   <fullquery name="lang::message::update_description.update_description_insert_null">
     <querytext>
       update lang_message_keys