changelog_bot (changelog_bot) wrote in changelog,
changelog_bot
changelog_bot
changelog

[ljcom] r6986: LJSUP-3640: Add Atlas ads code to LJ

Committer: gariev
LJSUP-3640: Add Atlas ads code to LJ

U   trunk/bin/upgrading/en_LJ.dat
U   trunk/cgi-bin/ljcom.pl
Modified: trunk/bin/upgrading/en_LJ.dat
===================================================================
--- trunk/bin/upgrading/en_LJ.dat	2009-01-21 08:39:26 UTC (rev 6985)
+++ trunk/bin/upgrading/en_LJ.dat	2009-01-21 10:24:05 UTC (rev 6986)
@@ -4610,6 +4610,10 @@
 
 web.ads.advertisement=<a [[aopts]]>Advertisement</a>
 
+web.ads.advertisement_by=<a [[aopts]]>Advertisement</a>
+
+web.ads.advertisement_ua=<a [[aopts]]>Advertisement</a>
+
 web.controlstrip.poweredby.alt=Powered by [[sitename]]
 
 web.controlstrip.poweredby.title=Home

Modified: trunk/cgi-bin/ljcom.pl
===================================================================
--- trunk/cgi-bin/ljcom.pl	2009-01-21 08:39:26 UTC (rev 6985)
+++ trunk/cgi-bin/ljcom.pl	2009-01-21 10:24:05 UTC (rev 6986)
@@ -2193,14 +2193,17 @@
     # cookie override.  (see /dev/ipclass.bml)
     my $cookie;
     if ($LJ::IS_DEV_SERVER && ($cookie = $BML::COOKIE{"fake_ipclass"})) {
-        return "" if $cookie eq "none";
+        return if $cookie eq "none";
+        my ($ip_class, $country) = split /:/, $cookie;
+        return (wantarray) ? ($ip_class, $country) : $ip_class;
         return $cookie;
     }
 
     if ($LJ::USE_IPMAP) {
         my $country = get_ipmap()->Resolve($ip);
         return unless $country;
-        return $ip_class_by_country_code{$country};
+        my $ip_class = $ip_class_by_country_code{$country};
+        return (wantarray) ? ($ip_class, $country) : $ip_class;
     }
 
     return;

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