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 -r1.17 -r1.18
--- openacs-4/packages/notifications/tcl/notification-display-procs.tcl	13 Dec 2007 14:45:27 -0000	1.17
+++ openacs-4/packages/notifications/tcl/notification-display-procs.tcl	21 Dec 2007 11:10:30 -0000	1.18
@@ -40,29 +40,31 @@
     
     if {![empty_string_p $request_id]} {
         set icon /resources/acs-subsite/email_delete.gif
-	set icon_alt [_ acs-subsite.icon_of_envelope]
+        set icon_alt [_ acs-subsite.icon_of_envelope]
         set sub_url [ad_quotehtml [unsubscribe_url -request_id $request_id -url $url]]
         set pretty_name [ad_quotehtml $pretty_name]
         set title [_ notifications.lt_Ubsubscribe_Notification_]
         set sub_chunk "[_ notifications.lt_You_have_requested_no]"
     } else {
         set icon /resources/acs-subsite/email_add.gif
-	set icon_alt [_ acs-subsite.icon_of_envelope]
+        set icon_alt [_ acs-subsite.icon_of_envelope]
         set sub_url [ad_quotehtml [subscribe_url -type $type -object_id $object_id -url $url -user_id $user_id -pretty_name $pretty_name]]
         set pretty_name [ad_quotehtml $pretty_name]
         set title [_ notifications.lt_Request_Notification_]
         set sub_chunk "[_ notifications.lt_You_may_a_hrefsub_url]"
     }
+    set notif_chunk "<a href=\"$sub_url\" title=\"$title\"><img src=\"$icon\" alt=\"$icon_alt\" style=\"border:0\"> $sub_chunk</a>"
     # if they are an admin give them to view all subscribers
     if { [permission::permission_p -object_id $object_id -privilege admin] } {
-	append sub_chunk " \[<a href=\"[export_vars -base /notifications/subscribers -url {object_id}]\">[_ notifications.Subscribers]</a>\]"
+        append notif_chunk " \[<a href=\"[export_vars -base /notifications/subscribers -url {object_id}]\">[_ notifications.Subscribers]</a>\]"
     }
 
-    if { [empty_string_p $sub_url] } {
+    if { ![empty_string_p $sub_url] } {
+        return $notif_chunk
+    } else {
          return ""
     }
 
-    return "<a href=\"$sub_url\" title=\"$title\"><img src=\"$icon\" alt=\"$icon_alt\" style=\"border:0\"> $sub_chunk</a>"
 }
 
 ad_proc -public notification::display::subscribe_url {