Index: openacs-4/packages/notifications/tcl/sweep-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/tcl/sweep-procs.tcl,v
diff -u -N -r1.23 -r1.24
--- openacs-4/packages/notifications/tcl/sweep-procs.tcl	31 Mar 2010 20:35:27 -0000	1.23
+++ openacs-4/packages/notifications/tcl/sweep-procs.tcl	27 Oct 2014 16:41:50 -0000	1.24
@@ -62,7 +62,7 @@
             foreach notif $notifications {
                 ns_log Debug "NOTIF-BATCHED: one notif $notif"
 
-                if {$notif != "STOP"} {
+                if {$notif ne "STOP"} {
                     ns_log Debug "NOTIF-BATCHED: NOT a stop codon"
                     set user_id [ns_set get $notif user_id]
                     set type_id [ns_set get $notif type_id]
@@ -74,12 +74,12 @@
 
                 # Check if we have a new user_id and type_id
                 # if so, batch up previous stuff and send it
-                if {$notif == "STOP" || $user_id != $prev_user_id || $type_id != $prev_type_id} {
+                if {$notif eq "STOP" || $user_id != $prev_user_id || $type_id != $prev_type_id} {
 
                     ns_log Debug "NOTIF-BATCHED: batching things up for $prev_user_id"
 
                     # If no content, keep going
-                    if {![empty_string_p $batched_content_text]} {
+                    if {$batched_content_text ne ""} {
                         ns_log Debug "NOTIF-BATCHED: content to send!"
                         db_transaction {
                             ns_log Debug "NOTIF-BATCHED: sending content"
@@ -115,7 +115,7 @@
                     }
                 }
 
-                if {$notif == "STOP"} {
+                if {$notif eq "STOP"} {
                     continue
                 }
                 
@@ -126,11 +126,11 @@
                 set notif_text [ns_set get $notif notif_text]
                 set notif_html [ns_set get $notif notif_html]
 
-                if {[empty_string_p $notif_text]} {
+                if {$notif_text eq ""} {
                     set notif_text [ad_html_text_convert -from html -to text -- $notif_html]
                 }
 
-                if {[empty_string_p $notif_html]} {
+                if {$notif_html eq ""} {
                     set notif_html [ad_html_text_convert -from text -to html -- $notif_text]
                 } else {
                     set html_content_p 1