Committer: gprochaev
LJSUP-6763. Letter does not match the specificationU trunk/bin/upgrading/en.dat U trunk/cgi-bin/LJ/Event/CommunityJoinReject.pm U trunk/htdocs/community/pending.bml
Modified: trunk/bin/upgrading/en.dat =================================================================== --- trunk/bin/upgrading/en.dat 2010-09-10 02:54:17 UTC (rev 17330) +++ trunk/bin/upgrading/en.dat 2010-09-10 03:37:31 UTC (rev 17331) @@ -1526,6 +1526,14 @@ Regards, [[sitename]] Team +<p align="left" style="font-size: 10px;"><a href="[[siteroot]]">LiveJournal Inc 2007 All Rights Reserved.</a></p> +<p align="left"> +<a href="[[siteroot]]/support/faq.bml">FAQs</a> | +<a href="http://news.livejournal.com">[[sitenameshort]] News</a> | +<a href="[[siteroot]]/site/search.bml">Explore [[sitenameshort]]</a> | +<a href="[[siteroot]]/shop/">Gift Shop</a> | +<a href="[[siteroot]]/legal">Site Policies</a> +</p> . @@ -1536,6 +1544,14 @@ Regards, [[sitename]] Team +<p align="left" style="font-size: 10px;"><a href="[[siteroot]]">LiveJournal Inc 2007 All Rights Reserved.</a></p> +<p align="left"> +<a href="[[siteroot]]/support/faq.bml">FAQs</a> | +<a href="http://news.livejournal.com">[[sitenameshort]] News</a> | +<a href="[[siteroot]]/site/search.bml">Explore [[sitenameshort]]</a> | +<a href="[[siteroot]]/shop/">Gift Shop</a> | +<a href="[[siteroot]]/legal">Site Policies</a> +</p> . @@ -2779,6 +2795,8 @@ notification_method.sms.title|staleness=1 notification_method.sms.title=TxtLJ +notification_method.sms-ru.title=SMS + number.million|staleness=1 number.million=[[number]] million Modified: trunk/cgi-bin/LJ/Event/CommunityJoinReject.pm =================================================================== --- trunk/cgi-bin/LJ/Event/CommunityJoinReject.pm 2010-09-10 02:54:17 UTC (rev 17330) +++ trunk/cgi-bin/LJ/Event/CommunityJoinReject.pm 2010-09-10 03:37:31 UTC (rev 17331) @@ -152,6 +152,7 @@ maintainer => $remover->{'user'}, reason => $reason, sitename => $LJ::SITENAME, + siteroot => $LJ::SITEROOT, }); } else { # Precache text lines Modified: trunk/htdocs/community/pending.bml =================================================================== --- trunk/htdocs/community/pending.bml 2010-09-10 02:54:17 UTC (rev 17330) +++ trunk/htdocs/community/pending.bml 2010-09-10 03:37:31 UTC (rev 17331) @@ -112,6 +112,8 @@ if ($POST{'reject_done'} eq '1') { my @userids = split(',', $POST{'ids'}); + my $reason = $POST{'reason'} || $ML{'.reason.default.text'}; + # need a db handle now my $dbh = LJ::get_db_writer(); @@ -121,7 +123,7 @@ LJ::approve_pending_member($cid, $id); $added++; } elsif ($POST{"reject"}) { - LJ::reject_pending_member($cid, $id, $remote->{userid}, $POST{'reason'}); + LJ::reject_pending_member($cid, $id, $remote->{userid}, $reason); $rejected++; } elsif ($POST{"reject_ban"}) { my $banlist = LJ::load_rel_user($c, 'B') || []; @@ -133,7 +135,7 @@ LJ::run_hooks('ban_set', $c, $us->{$id}); $banned++; - LJ::reject_pending_member($cid, $id, $remote->{userid}, $POST{'reason'}); # only in case of successful ban + LJ::reject_pending_member($cid, $id, $remote->{userid}, $reason); # only in case of successful ban $rejected++; # for keeping this user in list for later reject } } @@ -148,7 +150,7 @@ { community => $cname, username => $us->{$id}->{'user'}, - reason => $POST{'reason'}, + reason => $reason, sitename => $LJ::SITENAMESHORT, } ))