Андрей (andy) wrote in changelog,
Андрей
andy
changelog

[ljcom] r9747: LJSUP-7404 (We should put transaction in...

Committer: ailyin
LJSUP-7404 (We should put transaction info to token history.)
U   trunk/cgi-bin/LJ/Widget/Shop/History.pm
U   trunk/cgi-bin/LJ/Widget/Shop/PaidAccount.pm
Modified: trunk/cgi-bin/LJ/Widget/Shop/History.pm
===================================================================
--- trunk/cgi-bin/LJ/Widget/Shop/History.pm	2010-11-23 04:54:31 UTC (rev 9746)
+++ trunk/cgi-bin/LJ/Widget/Shop/History.pm	2010-11-23 07:51:28 UTC (rev 9747)
@@ -90,10 +90,10 @@
             if ($logitem->userid == $buyer_userid) {
                 $des = LJ::Lang::ml('wallet.widget.history.des.buy');
             } else {
-                my $buyer = LJ::load_userid($buyer_userid);
-                if ($logitem->item->get_anon) {
+                if ($logitem->item->get_anon || !$buyer_userid) {
                     $des = LJ::Lang::ml('wallet.widget.history.des.anon');
                 } else {
+                    my $buyer = LJ::load_userid($buyer_userid);
                     $des = LJ::Lang::ml('wallet.widget.history.des.rcvd', {
                         'from' => $buyer->ljuser_display,
                     });

Modified: trunk/cgi-bin/LJ/Widget/Shop/PaidAccount.pm
===================================================================
--- trunk/cgi-bin/LJ/Widget/Shop/PaidAccount.pm	2010-11-23 04:54:31 UTC (rev 9746)
+++ trunk/cgi-bin/LJ/Widget/Shop/PaidAccount.pm	2010-11-23 07:51:28 UTC (rev 9747)
@@ -349,7 +349,7 @@
         $cart->short_recheck_cart(\@errs, \@warns, \@remove);
 
         if (@warns) {
-            $self->ml_warning($_) foreach @warns;
+            $self->push_warning($_) foreach @warns;
         }
 
         if (@remove) {

Tags: andy, ljcom, pm
Subscribe
  • Post a new comment

    Error

    Anonymous comments are disabled in this journal

    default userpic

    Your reply will be screened

    Your IP address will be recorded 

  • 0 comments