Committer: vtroitsky
LJSUP-11979: Remove restriction on location. Enable promotions in different regional promos simultaneously.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-04-27 17:28:39 UTC (rev 11856) +++ trunk/cgi-bin/LJ/Widget/Shop/View/SelfPromo.pm 2012-04-27 17:36:28 UTC (rev 11857) @@ -284,16 +284,16 @@ $object_url = $object->url; - # TODO: Move into slot - if(LJ::is_enabled('selfpromo_ua')) { - my $anti_slot = LJ::Pay::PromotionSlot->find_slot(class => PROMO_SELF(), type => $type , anti_region => $slot->region()); - my $anti_object = $anti_slot->current_promoted_object(); - if ($anti_object) { - if ( $type eq 'entry' ? $object->ditemid == $anti_object->ditemid : $object->id == $anti_object->id ) { - $self->ml_error('selfpromo.error.two_promos_'.$type); - } - } - } + # Obsolete + #if(LJ::is_enabled('selfpromo_ua')) { + # my $anti_slot = LJ::Pay::PromotionSlot->find_slot(class => PROMO_SELF(), type => $type , anti_region => $slot->region()); + # my $anti_object = $anti_slot->current_promoted_object(); + # if ($anti_object) { + # if ( $type eq 'entry' ? $object->ditemid == $anti_object->ditemid : $object->id == $anti_object->id ) { + # $self->ml_error('selfpromo.error.two_promos_'.$type); + # } + # } + #} my $ineligible_reason; my $object_eligible = $slot->is_object_eligible( $object, $remote, \$ineligible_reason );