Allow user_blocks to be created for longer periods

[rails.git] / app / helpers / note_helper.rb

diff --git a/app/helpers/note_helper.rb b/app/helpers/note_helper.rb
index 87bd86f428e4edd7e1e821d84a9840694c8758c7..4b5be42d78b8786988be869e4dc5d2b5ca3c1901 100644 (file)
--- a/app/helpers/note_helper.rb
+++ b/app/helpers/note_helper.rb
@@ -3,22 +3,22 @@ module NoteHelper
     if by.nil?
       I18n.t("browse.note." + event + "_by_anonymous",
              :when => friendly_date(at),
     if by.nil?
       I18n.t("browse.note." + event + "_by_anonymous",
              :when => friendly_date(at),

-             :exact_time => l(at)
-            ).html_safe
+             :exact_time => l(at)).html_safe

     else
       I18n.t("browse.note." + event + "_by",
              :when => friendly_date(at),
              :exact_time => l(at),
     else
       I18n.t("browse.note." + event + "_by",
              :when => friendly_date(at),
              :exact_time => l(at),

-             :user => note_author(by)
-            ).html_safe
+             :user => note_author(by)).html_safe

     end
   end
 
   def note_author(author, link_options = {})
     if author.nil?
       ""
     end
   end
 
   def note_author(author, link_options = {})
     if author.nil?
       ""

+    elsif author.status == "deleted"
+      t("users.no_such_user.deleted")

     else
     else

-      link_to h(author.display_name), link_options.merge(:controller => "user", :action => "view", :display_name => author.display_name)
+      link_to h(author.display_name), link_options.merge(:controller => "/users", :action => "show", :display_name => author.display_name)

     end
   end
 end
     end
   end
 end