Committer: emazin
LJINT-416: fixU trunk/cgi-bin/LJ/PartnerSite.pm U trunk/htdocs/gadgets/loginstatus.bml
Modified: trunk/cgi-bin/LJ/PartnerSite.pm =================================================================== --- trunk/cgi-bin/LJ/PartnerSite.pm 2011-04-01 09:47:39 UTC (rev 10339) +++ trunk/cgi-bin/LJ/PartnerSite.pm 2011-04-01 10:10:33 UTC (rev 10340) @@ -198,7 +198,7 @@ xdreceiver_path rate_limits encoding mapping_locked disabled dochash_salt sync_comments_count_url_pattern - resources_html resources partner_resources ); + lj_resources partner_resources ); ### CLASS METHODS ### @@ -985,4 +985,20 @@ =cut +sub resources { + my $self = shift; + + my $resources = $self->partner_resources; + + if ($self->lj_resources) { + LJ::need_res( { clean_list => 1 } ); + LJ::need_res( @{ $self->resources } ); + $resources .= LJ::res_includes( {only_needed => 1} ); + } else { + $resources .= LJ::res_includes(); + } + + return $resources; +} + 1; Modified: trunk/htdocs/gadgets/loginstatus.bml =================================================================== --- trunk/htdocs/gadgets/loginstatus.bml 2011-04-01 09:47:39 UTC (rev 10339) +++ trunk/htdocs/gadgets/loginstatus.bml 2011-04-01 10:10:33 UTC (rev 10340) @@ -48,14 +48,6 @@ $partner_remote_ljuser = $partner->ljuser_html($remote); } - my $resources_html = $partner->partner_resources; - - if ($resources_html) { - LJ::need_res( { clean_list => 1 } ); - LJ::need_res( @{ $partner->{resources} } ); - } - $resources_html .= LJ::res_includes(); - my $template = LJ::HTML::Template->new( { use_expr => 1 }, # force HTML::Template::Pro with Expr support filename => "$ENV{'LJHOME'}/templates/Identity/LoginStatus.tmpl", @@ -68,7 +60,7 @@ 'js_check_domain' => $js_check_domain, 'partner_remote_ljuser' => $partner_remote_ljuser, 'logout_url' => $logout_url, - 'resources_html' => $resources_html, + 'resources_html' => $partner->resources, 'logged_in' => $remote ? 1 : 0, );