holyandrew (holyandrew) wrote in changelog,
holyandrew
holyandrew
changelog

[ljcom] r11859: LJSUP-11857: Cyr sub domains

Committer: akanashin
LJSUP-11857: Cyr sub domains
U   trunk/cgi-bin/LJ/Widget/ErrorPage.pm
Modified: trunk/cgi-bin/LJ/Widget/ErrorPage.pm
===================================================================
--- trunk/cgi-bin/LJ/Widget/ErrorPage.pm	2012-04-28 08:05:36 UTC (rev 11858)
+++ trunk/cgi-bin/LJ/Widget/ErrorPage.pm	2012-04-28 09:02:39 UTC (rev 11859)
@@ -117,7 +117,7 @@
         my %args             = @_;
         return {
             'title'        => LJ::Lang::ml('.errorpage.baddomainru.title'),
-            'description'  => LJ::Lang::ml('.errorpage.baddomainru.description', { 'domainname' => $args{'journal_username'}, 'uri' => $args{'uri'} }),
+            'description'  => LJ::Lang::ml('.errorpage.baddomainru.description', { 'domainname' => $args{'domainname'}, 'uri' => $args{'uri_domain_shop'} }),
             'links'        => [qw( home faq sitemap )],
             'ads_location' => 'error_page.baduser',
         };
@@ -354,6 +354,9 @@
     my $remote                  = $args{'remote'};
     my $active_journal_username = $args{'active_journal_username'};
 
+    my $domainname = $args{'domainname'};
+    my $uri_domain_shop = $args{'uri_domain_shop'};
+
     my $journal;
     if ( defined $active_journal_username ) {
         $journal = LJ::load_user($active_journal_username);
@@ -365,6 +368,8 @@
         'remote'                => $remote,
         'journal_username'      => $active_journal_username,
         'remote_equals_journal' => LJ::u_equals( $remote, $journal ),
+        'domainname'            => $domainname,
+        'uri_domain_shop'       => $uri_domain_shop,
     );
 
     LJ::Lang::current_scope('/error-page.bml');

Tags: akanashin, holyandrew, 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