Index: openacs-4/packages/notifications/tcl/notification-callback-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/tcl/notification-callback-procs.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/notifications/tcl/notification-callback-procs.tcl	27 Oct 2014 16:41:50 -0000	1.5
+++ openacs-4/packages/notifications/tcl/notification-callback-procs.tcl	7 Aug 2017 23:48:13 -0000	1.6
@@ -13,7 +13,7 @@
     Show the notifications of user_id
 } {
     set result [list "Notifications of $user_id"]
-    set user_notifications [db_list_of_lists user_notification { *SQL* }]
+    set user_notifications [db_list_of_lists user_notification {}]
     lappend result $user_notifications
     return $result
 }
@@ -29,8 +29,8 @@
     ns_log Notice $msg
     
     db_transaction {
-	db_dml upd_notifications { *SQL* }
-	db_dml upd_map { *SQL* }
+	db_dml upd_notifications {}
+	db_dml upd_map {}
 	lappend result "Notifications merge is done"
     } 
     return $result
@@ -80,7 +80,7 @@
 
     # Find the user_id of the sender
     ns_log Notice "acs_mail_lite::incoming_email -impl notifications: from $from"
-    set user_id [cc_lookup_email_user $from]
+    set user_id [party::get_by_email -email $from]
     
     # We don't accept empty users for now
     if {$user_id eq ""} {
@@ -135,3 +135,9 @@
     -array:required
 } {
 } -
+
+# Local variables:
+#    mode: tcl
+#    tcl-indent-level: 4
+#    indent-tabs-mode: nil
+# End: