Index: openacs-4/packages/notifications/tcl/notification-display-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/tcl/notification-display-procs.tcl,v
diff -u -N -r1.18 -r1.18.10.1
--- openacs-4/packages/notifications/tcl/notification-display-procs.tcl	21 Dec 2007 11:10:30 -0000	1.18
+++ openacs-4/packages/notifications/tcl/notification-display-procs.tcl	27 Aug 2013 12:20:38 -0000	1.18.10.1
@@ -24,11 +24,11 @@
     mounted then return the empty string.
 } {
     # Check that we're mounted
-    if { [empty_string_p [apm_package_url_from_key [notification::package_key]]] } {
+    if { [apm_package_url_from_key [notification::package_key]] eq "" } {
         return {}
     }
     
-    if {[empty_string_p $user_id]} {
+    if {$user_id eq ""} {
         set user_id [ad_conn user_id]
     }
 
@@ -38,7 +38,7 @@
     # Check if subscribed
     set request_id [notification::request::get_request_id -type_id $type_id -object_id $object_id -user_id $user_id]
     
-    if {![empty_string_p $request_id]} {
+    if {$request_id ne ""} {
         set icon /resources/acs-subsite/email_delete.gif
         set icon_alt [_ acs-subsite.icon_of_envelope]
         set sub_url [ad_quotehtml [unsubscribe_url -request_id $request_id -url $url]]
@@ -59,7 +59,7 @@
         append notif_chunk " \[<a href=\"[export_vars -base /notifications/subscribers -url {object_id}]\">[_ notifications.Subscribers]</a>\]"
     }
 
-    if { ![empty_string_p $sub_url] } {
+    if { $sub_url ne "" } {
         return $notif_chunk
     } else {
          return ""
@@ -81,7 +81,7 @@
 
     set root_path [apm_package_url_from_key [notification::package_key]]
 
-    if { [empty_string_p $root_path] } {
+    if { $root_path eq "" } {
         return ""
     }
 
@@ -98,7 +98,7 @@
 } {
     set root_path [apm_package_url_from_key [notification::package_key]]
 
-    if { [empty_string_p $root_path] } {
+    if { $root_path eq "" } {
         return ""
     }
 
@@ -129,20 +129,20 @@
     @return a Tcl list with two elements (subscribe_url, unsubscribe_url)
 } {
     set root_path [apm_package_url_from_key [notification::package_key]]
-    if { [empty_string_p $root_path] } {
+    if { $root_path eq "" } {
         return [list {} {}]
     }
     set type_id [notification::type::get_type_id -short_name $type]
 
-    if { [empty_string_p $return_url] } {
+    if { $return_url eq "" } {
         set return_url [ad_return_url]
     }
 
     # Check if subscribed
     set request_id [notification::request::get_request_id -type_id $type_id -object_id $object_id -user_id [ad_conn untrusted_user_id]]
 
 
-    if { [empty_string_p $request_id] } {
+    if { $request_id eq "" } {
         return [list [export_vars -base "${root_path}request-new" { type_id object_id pretty_name return_url }] {}]
     } else {
         return [list {} [export_vars -base "${root_path}request-delete" { request_id return_url }]]