[ljcom] r11660: LJSUP-11372: Previous errors fixed.

U   trunk/cgi-bin/LJ/Widget/Shop/View/SelfPromo.pm

Modified: trunk/cgi-bin/LJ/Widget/Shop/View/SelfPromo.pm
===================================================================
--- trunk/cgi-bin/LJ/Widget/Shop/View/SelfPromo.pm	2012-03-30 08:39:35 UTC (rev 11659)
+++ trunk/cgi-bin/LJ/Widget/Shop/View/SelfPromo.pm	2012-03-30 13:19:59 UTC (rev 11660)
@@ -80,7 +80,7 @@
         # my $current_promo = LJ::Pay::SelfPromo->get_current_promo(type => $type);
         # my $data_selfpromo = $current_promo ? $current_promo->get_template_params() : [];
 
-        my $data_selfpromo = LJ::PersonalStats->get_selfpromo_data( { 'type' => $type , ($view_ua_ratings ? 'ua' : 'cyr') } );
+        my $data_selfpromo = LJ::PersonalStats->get_selfpromo_data( { 'type' => $type , 'country' => ($view_ua_ratings ? 'ua' : 'cyr') } );
 
     # TODO (refactoring): encapsulate all thet logic into PromoObject::get_template_params() function 
         my $buyout_cost = $class->buyout_cost;
@@ -221,7 +221,7 @@
         return $format_result->( 'error', LJ::Lang::ml('/shop/selfpromo.bml.error.'.$type.'.not_specified') );
     }
 
-    unless ( $object_url =~ m{^https?://} || $type ne 'entry') {
+    unless ($type ne 'entry' || $object_url =~ m{^https?://}) {
         $object_url = 'http://' . $object_url;
     }
 
@@ -297,7 +297,7 @@
         $self->ml_error('/shop/selfpromo.bml.error.'.$type.'.not_specified');
     }
 
-    unless ( $object_url =~ m{^https?://} || $type ne 'entry') {
+    unless ( $type ne 'entry' || $object_url =~ m{^https?://}) {
         $object_url = 'http://' . $object_url;
     }