[livejournal] r22547: iLJSUP-12902: Create notifications for r...

U   trunk/cgi-bin/LJ/Event/JournalNewRepost.pm

Modified: trunk/cgi-bin/LJ/Event/JournalNewRepost.pm
===================================================================
--- trunk/cgi-bin/LJ/Event/JournalNewRepost.pm	2012-08-02 07:40:06 UTC (rev 22546)
+++ trunk/cgi-bin/LJ/Event/JournalNewRepost.pm	2012-08-02 08:48:28 UTC (rev 22547)
@@ -40,7 +40,7 @@
     my ($self) = @_;
     my $entry  = $self->entry;
 
-    return $self->u;
+    return $entry->poster;
 }
 
 sub posterid {
@@ -321,8 +321,9 @@
     # make hyperlinks for options
     # tags 'poster' and 'journal' cannot contain html <a> tags
     # when it used between [[openlink]] and [[closelink]] tags.
-    my $vars = { poster  => $poster_text, 
-                 journal => $journal_text, };
+    my $vars = { poster    => $poster_text, 
+                 journal   => $reposter_name,
+                 community => $journal, };
 
     $email .= LJ::Lang::get_text($lang, $ml_head_string, undef,
                 {
@@ -351,12 +352,10 @@
                                                     "$LJ::SITEROOT/community/join.bml?comm=$journal_user" ],
                 'esn.read_user_entries'     => [ 1, $journal_url ],
                 'esn.add_friend'            => [ LJ::is_friend($u, $self->reposter)? 0 : 5,
-                                                    "$LJ::SITEROOT/friends/add.bml?user=" . $u->user  ],
+                                                    "$LJ::SITEROOT/friends/add.bml?user=" . $reposter->user  ],
             });
 
-    return $email;
-
-    
+    return $email; 
 }
 
 sub as_email_string {