[ljcom] r10974: LJSUP-9743 (site schemes refactoring)
Committer: ailyin
LJSUP-9743 (site schemes refactoring)U trunk/cgi-bin/LJ/Nav.pm U trunk/cgi-bin/LJ/SiteScheme/Lanzelot.pm
Modified: trunk/cgi-bin/LJ/Nav.pm
===================================================================
--- trunk/cgi-bin/LJ/Nav.pm 2011-09-07 08:04:11 UTC (rev 10973)
+++ trunk/cgi-bin/LJ/Nav.pm 2011-09-08 02:30:43 UTC (rev 10974)
@@ -12,7 +12,7 @@
my ( $class, $remote, $scheme, $opts ) = @_;
# ensure that $remote is an LJ::User object
- unless ( LJ::isu($remote) ) {
+ if ( $remote && ! LJ::isu($remote) ) {
my $userid = FB::get_domain_userid($remote);
$remote = LJ::load_userid($userid);
}
Modified: trunk/cgi-bin/LJ/SiteScheme/Lanzelot.pm
===================================================================
--- trunk/cgi-bin/LJ/SiteScheme/Lanzelot.pm 2011-09-07 08:04:11 UTC (rev 10973)
+++ trunk/cgi-bin/LJ/SiteScheme/Lanzelot.pm 2011-09-08 02:30:43 UTC (rev 10974)
@@ -95,7 +95,7 @@
my (
$ad_beforetitle, $ad_beforetitle_slots_params,
$ad_beforetitle_width, $content_wrapper_margin,
- ) = ( '', {}, '', '' );
+ ) = ( '', '', '', '' );
$ad_beforetitle = LJ::get_ads(
{
