Committer: gprochaev
LJSUP-10505. Allow access to new photohosting for all usersU trunk/cgi-bin/LJ/Widget/ErrorPage.pm U trunk/htdocs/error-page.bml.text
Modified: trunk/cgi-bin/LJ/Widget/ErrorPage.pm =================================================================== --- trunk/cgi-bin/LJ/Widget/ErrorPage.pm 2011-12-01 13:31:56 UTC (rev 11230) +++ trunk/cgi-bin/LJ/Widget/ErrorPage.pm 2011-12-01 13:42:17 UTC (rev 11231) @@ -232,11 +232,12 @@ 'ljphoto_members' => sub { my $ml_description = ''; - my $ljphoto_comm = LJ::load_user($LJ::LJPHOTO_ALLOW_FROM_COMMUNITIES[0]); - if ($ljphoto_comm) { + my %args = @_; + my $remote = $args{'remote'}; + + if ($remote && !$remote->prop ('fotki_migration_status')) { $ml_description = LJ::Lang::ml( - '.errorpage.ljphoto_closed.description', - { 'ljphoto_comm' => $ljphoto_comm->ljuser_display }, + '.errorpage.ljphoto_closed_prop.description', ); } @@ -297,6 +298,7 @@ my $handler = $handlers{$error_type} || $handlers{'_default'}; my %handler_args = ( 'journal' => $journal, + 'remote' => $remote, 'journal_username' => $active_journal_username, 'remote_equals_journal' => LJ::u_equals( $remote, $journal ), ); Modified: trunk/htdocs/error-page.bml.text =================================================================== --- trunk/htdocs/error-page.bml.text 2011-12-01 13:31:56 UTC (rev 11230) +++ trunk/htdocs/error-page.bml.text 2011-12-01 13:42:17 UTC (rev 11231) @@ -50,6 +50,8 @@ .errorpage.ljphoto_closed.description|staleness=1 .errorpage.ljphoto_closed.description=To get access you can request to join a community of [[ljphoto_comm]]. +.errorpage.ljphoto_closed_prop.description=To get access you must migrate to PhotoAlbums. + .errorpage.ljphoto_closed.title|staleness=1 .errorpage.ljphoto_closed.title=Access is closed.