[dw-free] ext_nnn form used for OpenID users in various PM-related locations

[mark]

[commit: http://hg.dwscoalition.org/dw-free/rev/9c52a13b8423]

http://bugs.dwscoalition.org/show_bug.cgi?id=701

Given Identity accounts their display name instead of ext_NNN.

Patch by yvi.

Files modified:

• cgi-bin/LJ/Event/UserMessageRecvd.pm
• htdocs/inbox/compose.bml

--------------------------------------------------------------------------------
diff -r a10b619f0170 -r 9c52a13b8423 cgi-bin/LJ/Event/UserMessageRecvd.pm
--- a/cgi-bin/LJ/Event/UserMessageRecvd.pm	Sun Sep 13 05:08:31 2009 +0000
+++ b/cgi-bin/LJ/Event/UserMessageRecvd.pm	Sun Sep 13 05:12:26 2009 +0000
@@ -44,8 +44,8 @@ sub _as_email {
         subject         => $is_html ? $msg->subject : $msg->subject_raw,
         body            => $is_html ? $msg->body : $msg->body_raw,
         sender          => $is_html ? ($other_u->ljuser_display) : ($other_u->user),
-        postername      => $other_u->user,
-        journal         => $other_u->user,
+        postername      => $other_u->display_name,
+        journal         => $other_u->display_name,
         sitenameshort   => $LJ::SITENAMESHORT,
         inbox           => $inbox,
     };
@@ -55,7 +55,7 @@ sub _as_email {
         {
             'esn.reply_to_message' => [ 1, $replyurl ],
             'esn.view_profile'     => [ 2, $other_u->profile_url ],
-            'esn.read_journal'     => [ 3, $other_u->journal_base ],
+            'esn.read_journal'     => [ $other_u->is_identity ? 0 : 3, $other_u->journal_base ],
             'esn.add_watch'        => [ $u->watches( $other_u ) ? 0 : 4,
                                              "$LJ::SITEROOT/manage/circle/add?user=$sender&action=subscribe" ],
         }
diff -r a10b619f0170 -r 9c52a13b8423 htdocs/inbox/compose.bml
--- a/htdocs/inbox/compose.bml	Sun Sep 13 05:08:31 2009 +0000
+++ b/htdocs/inbox/compose.bml	Sun Sep 13 05:12:26 2009 +0000
@@ -165,8 +165,8 @@ body<=
             return $body;
         }
 
-        $reply_to = $msg->other_u->user;
         $reply_u = $msg->other_u;
+        $reply_to = $reply_u->display_name;
         $disabled_to = 1;
         $msg_subject = $msg->subject || "(no subject)";
         $msg_subject = "Re: " . $msg_subject
--------------------------------------------------------------------------------