[dw-free] Search and destroy for weird instances of 'lj' in things

[mark]

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

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

Change X-LJ-Journal headers to X-Journal-User in comment emails. If you use
these to filter, you'll have to update your filters.

Patch by chemicallace.

Files modified:

• cgi-bin/LJ/Event/JournalNewComment.pm
• cgi-bin/LJ/Talk.pm

--------------------------------------------------------------------------------
diff -r 385d6b669f0c -r efbaa4882260 cgi-bin/LJ/Event/JournalNewComment.pm
--- a/cgi-bin/LJ/Event/JournalNewComment.pm	Sun May 02 06:26:55 2010 +0000
+++ b/cgi-bin/LJ/Event/JournalNewComment.pm	Sun May 02 06:32:20 2010 +0000
@@ -85,7 +85,7 @@ sub as_email_headers {
         'Message-ID'   => $this_msgid,
         'In-Reply-To'  => $par_msgid,
         'References'   => "$top_msgid $par_msgid",
-        'X-LJ-Journal' => $journalu->user,
+        'X-Journal-Name' => $journalu->user,
     };
 
     return $headers;
diff -r 385d6b669f0c -r efbaa4882260 cgi-bin/LJ/Talk.pm
--- a/cgi-bin/LJ/Talk.pm	Sun May 02 06:26:55 2010 +0000
+++ b/cgi-bin/LJ/Talk.pm	Sun May 02 06:32:20 2010 +0000
@@ -2369,7 +2369,7 @@ sub mail_comments {
                                            'In-Reply-To:' => $par_msgid,
                                            'References' => "$top_msgid $par_msgid",
                                            );
-                $msg->add('X-LJ-JOURNAL' => $journalu->{'user'}); # for mail filters
+                $msg->add('X-JOURNAL-USER' => $journalu->{'user'}); # for mail filters
 
                 $parent->{u} = $paru;
                 $parent->{body} = $parentcomment;
@@ -2432,7 +2432,7 @@ sub mail_comments {
                                    'In-Reply-To:' => $par_msgid,
                                    'References' => "$top_msgid $par_msgid",
                                    );
-        $msg->add('X-LJ-JOURNAL' => $journalu->{'user'}); # for mail filters
+        $msg->add('X-JOURNAL-USER' => $journalu->{'user'}); # for mail filters
 
         my $quote = $parentcomment ? $parentcomment : $item->{'event'};
 
@@ -2503,7 +2503,7 @@ sub mail_comments {
                                   'In-Reply-To:' => $par_msgid,
                                   'References' => "$top_msgid $par_msgid",
                                   );
-        $msg->add('X-LJ-JOURNAL' => $journalu->{'user'}); # for mail filters
+        $msg->add('X-JOURNAL-USER' => $journalu->{'user'}); # for mail filters
 
         my $quote = $parentcomment ? $parentcomment : $item->{'event'};
 
--------------------------------------------------------------------------------