Renamed @user_message_author to @author as suggested

diff --git a/app/models/notifier.rb b/app/models/notifier.rb
index 1de86512088e030cdc5f75846178f334aac39a6d..8e386edf84bbcfe2baf78f9c3fc58f91608f2b88 100644 (file)
--- a/app/models/notifier.rb
+++ b/app/models/notifier.rb
@@ -77,7 +77,7 @@ class Notifier < ActionMailer::Base
       @replyurl = url_for(:host => SERVER_URL,
                           :controller => "message", :action => "reply",
                           :message_id => message.id)
       @replyurl = url_for(:host => SERVER_URL,
                           :controller => "message", :action => "reply",
                           :message_id => message.id)

-      @user_message_author = @from_user
+      @author = @from_user

 
       attach_user_avatar(message.sender)
 
 
       attach_user_avatar(message.sender)
 


@@ -110,7 +110,7 @@ class Notifier < ActionMailer::Base
                           :action => "new",
                           :display_name => comment.user.display_name,
                           :title => "Re: #{comment.diary_entry.title}")
                           :action => "new",
                           :display_name => comment.user.display_name,
                           :title => "Re: #{comment.diary_entry.title}")

-      @user_message_author = @from_user
+      @author = @from_user

 
       attach_user_avatar(comment.user)
 
 
       attach_user_avatar(comment.user)
 


@@ -129,7 +129,7 @@ class Notifier < ActionMailer::Base
       @friendurl = url_for(:host => SERVER_URL,
                            :controller => "user", :action => "make_friend",
                            :display_name => @friend.befriender.display_name)
       @friendurl = url_for(:host => SERVER_URL,
                            :controller => "user", :action => "make_friend",
                            :display_name => @friend.befriender.display_name)

-      @user_message_author = @friend.befriender.display_name
+      @author = @friend.befriender.display_name

 
       attach_user_avatar(@friend.befriender)
       mail :to => friend.befriendee.email,
 
       attach_user_avatar(@friend.befriender)
       mail :to => friend.befriendee.email,


@@ -151,7 +151,7 @@ class Notifier < ActionMailer::Base
                      I18n.t("notifier.note_comment_notification.anonymous")
                    end
 
                      I18n.t("notifier.note_comment_notification.anonymous")
                    end
 

-      @user_message_author = @commenter
+      @author = @commenter

       attach_user_avatar(comment.author)
 
       subject = if @owner
       attach_user_avatar(comment.author)
 
       subject = if @owner


@@ -173,7 +173,7 @@ class Notifier < ActionMailer::Base
       @changeset_comment = comment.changeset.tags["comment"].presence
       @time = comment.created_at
       @changeset_author = comment.changeset.user.display_name
       @changeset_comment = comment.changeset.tags["comment"].presence
       @time = comment.created_at
       @changeset_author = comment.changeset.user.display_name

-      @user_message_author = @commenter
+      @author = @commenter

 
       subject = if @owner
                   I18n.t("notifier.changeset_comment_notification.commented.subject_own", :commenter => @commenter)
 
       subject = if @owner
                   I18n.t("notifier.changeset_comment_notification.commented.subject_own", :commenter => @commenter)

diff --git a/app/views/notifier/_user_message_table.html.erb b/app/views/notifier/_user_message_table.html.erb
index 0a73001734e1b944c2293af69076cef6919256bf..1b33e082b6bc335b45693b59a59d2972047706f1 100644 (file)
--- a/app/views/notifier/_user_message_table.html.erb
+++ b/app/views/notifier/_user_message_table.html.erb
@@ -4,10 +4,10 @@
       <%= link_to(
           image_tag(
             attachments["avatar.png"].url,
       <%= link_to(
           image_tag(
             attachments["avatar.png"].url,

-            alt: @user_message_author,
-            title: @user_message_author
+            alt: @author,
+            title: @author

           ),
           ),

-          user_url(@user_message_author, :host => SERVER_URL),
+          user_url(@author, :host => SERVER_URL),

           :target => "_blank"
       ) %>
     </td>
           :target => "_blank"
       ) %>
     </td>