Index: openacs-4/packages/dotlrn/tcl/community-procs-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/community-procs-oracle.xql,v
diff -u -r1.25 -r1.25.2.1
--- openacs-4/packages/dotlrn/tcl/community-procs-oracle.xql	12 Jul 2004 14:49:56 -0000	1.25
+++ openacs-4/packages/dotlrn/tcl/community-procs-oracle.xql	27 Dec 2005 21:50:53 -0000	1.25.2.1
@@ -116,4 +116,16 @@
         </querytext>
     </fullquery>
 
+    <fullquery name="dotlrn_community::send_member_email.member_email">
+        <querytext>
+            select from_addr,
+	           subject,
+               email
+            from dotlrn_member_emails
+            where (enabled_p='t' or :override_enabled_p = 1)
+	          and community_id = :community_id
+	          and type = :type
+		</querytext>
+	</fullquery>
+
 </queryset>
Index: openacs-4/packages/dotlrn/tcl/community-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/community-procs-postgresql.xql,v
diff -u -r1.4 -r1.4.2.1
--- openacs-4/packages/dotlrn/tcl/community-procs-postgresql.xql	29 Jun 2004 10:17:54 -0000	1.4
+++ openacs-4/packages/dotlrn/tcl/community-procs-postgresql.xql	27 Dec 2005 21:50:53 -0000	1.4.2.1
@@ -104,4 +104,16 @@
         </querytext>
     </fullquery>
 
+    <fullquery name="dotlrn_community::send_member_email.member_email">
+        <querytext>
+            select from_addr,
+	           subject,
+                   email
+            from dotlrn_member_emails
+            where (enabled_p or :override_enabled_p = 1)
+	          and community_id = :community_id
+	          and type = :type
+		</querytext>
+	</fullquery>
+
 </queryset>
Index: openacs-4/packages/dotlrn/tcl/community-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/community-procs.tcl,v
diff -u -r1.191.2.20 -r1.191.2.21
--- openacs-4/packages/dotlrn/tcl/community-procs.tcl	15 Dec 2005 22:54:27 -0000	1.191.2.20
+++ openacs-4/packages/dotlrn/tcl/community-procs.tcl	27 Dec 2005 21:50:53 -0000	1.191.2.21
@@ -2239,15 +2239,7 @@
 
 	set var_list [lindex [callback dotlrn::member_email_var_list -community_id $community_id -to_user $to_user -type $type] 0]
 	array set vars $var_list
-        if {![db_0or1row member_email {
-            select from_addr,
-	           subject,
-                   email
-            from dotlrn_member_emails
-            where (enabled_p or :override_enabled_p = 1)
-	          and community_id = :community_id
-	          and type = :type
-        }] }  {
+        if {![db_0or1row member_email {*SQL*}] }  {
 
             # Only use the default mail if this is set in a parameter (off by default).
             if {[parameter::get_from_package_key -package_key "dotlrn" -parameter "DefaultCommunityJoinMailP" -default 0]} {