madeon (madeon) wrote in changelog,
madeon
madeon
changelog

[livejournal] r21676: LJSV-2133: Domain mapping broken for aut...

Committer: sbelyaev
LJSV-2133: Domain mapping broken for authorized users (work as redirect to login.bml)
U   trunk/cgi-bin/LJ/Session.pm
Modified: trunk/cgi-bin/LJ/Session.pm
===================================================================
--- trunk/cgi-bin/LJ/Session.pm	2012-04-09 07:46:23 UTC (rev 21675)
+++ trunk/cgi-bin/LJ/Session.pm	2012-04-09 11:05:01 UTC (rev 21676)
@@ -475,7 +475,7 @@
 # NOTE: internal function REQUIRES trusted input
 sub helper_url {
     my ($class, $dest) = @_;
-
+ 
     return unless $dest;
 
     my $u = LJ::get_remote();
@@ -508,8 +508,7 @@
         return "${setdomsess}/__setdomsess?dest="
              . LJ::eurl($dest)
              . "&k=" . LJ::eurl($domcook)
-             . "&v=" . LJ::eurl($cookie)
-             if exists $LJ::DOMAIN_JOURNALS_REVERSE{$1};
+             . "&v=" . LJ::eurl($cookie);
     }
 
     return;
@@ -558,7 +557,7 @@
 
     $host =~ s/^www\.//;
 
-    return undef unless
+    return wantarray ? ( '__external', "") : '__external' unless
         $host =~ m!^([\w\-\.]{1,50})\.\Q$LJ::USER_DOMAIN\E$! or exists $LJ::DOMAIN_JOURNALS_REVERSE{$host};
 
     my $subdomain = lc($1);

Tags: livejournal, madeon, pm, sbelyaev
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