Committer: amyshkin
LJSUP-9804: Problem with writing properties data for entries on Omega/Alpha/Beta serversU trunk/cgi-bin/ljcom.pl
Modified: trunk/cgi-bin/ljcom.pl =================================================================== --- trunk/cgi-bin/ljcom.pl 2011-09-30 08:18:15 UTC (rev 11062) +++ trunk/cgi-bin/ljcom.pl 2011-10-03 05:05:13 UTC (rev 11063) @@ -32,7 +32,7 @@ @LJ::USER_TABLES_LOCAL = ("phonepostentry", "phoneposttrans", "vgifts", "sms_quota", "sms_promo", "spinvox_msg", - "jabroster2", "jabrostergroups2", "inactive_user", "smsru", + "jabroster2", "jabrostergroups2", "inactive_user", "smsru", "friendstimes", "friendstimes2_unwatched", "fotki_albums", "fotki_photos", "fotki_tags", "fotki_tags_map", ); @@ -198,7 +198,7 @@ : $BML::ML{'ljcom.userinfo.types.sponsored'}; } } - } elsif (LJ::caps_in_group($caps, "trynbuy")) { + } elsif (LJ::caps_in_group($caps, "trynbuy")) { ## TRY'n'BUY return LJ::Lang::ml('trynbuy.account.title', {expdate => LJ::TryNBuy->exp_date($opts{u})}); } elsif (LJ::caps_in_group($caps, "plus")) { @@ -767,7 +767,7 @@ return $code_words->('ljcom.badpass.ascii'); } - # contains letters (and may contain digits) + # contains letters (and may contain digits) if ($password =~ /^\d+$/) { return $code_words->('ljcom.badpass.digits_only'); } @@ -906,7 +906,7 @@ return undef unless $LJ::ONLY_USER_VHOSTS; return "#" unless $u; - ## + ## ## A special case for Independent Mind journals: ## their domain aliases are primary journal addresses ## @@ -916,14 +916,14 @@ return "http://$domain"; } } - + ## ## Case of journals linked to domains ## if (my $domain = $LJ::DOMAIN_JOURNALS{ $u->{user} }) { return "http://$domain"; } - + # rule format: # accounttype => [$use_user_vhost_if_no_underscore, $domain_to_use_otherwise] @@ -1638,7 +1638,7 @@ $src = $attr->{src} if exists $attr->{src} and defined $attr->{src}; } - + # Fake a few tokens from the html cleaner to pass into our next hook. my @tags = ( ['S', 'lj-template', { @@ -1765,7 +1765,7 @@ my $eurl = LJ::eall($url); my $wmode_param = $other->{wmode} ? "<param name=\"wmode\" value=\"$other->{wmode}\"></param>" : ""; - my $embed = + my $embed = "<object width=\"$width\" height=\"$height\">" . "<param name=\"movie\" value=\"$eurl\"></param>" . $wmode_param . @@ -1864,7 +1864,7 @@ if $action eq 'vgift_row_deleted'; if ($action eq 'userpic_resizer') { - my ($type, $old_size, $new_size, $old_exp, $new_exp) = + my ($type, $old_size, $new_size, $old_exp, $new_exp) = @$extra{ qw/ upic_type old_packs new_packs old_exp new_exp/ }; return "Userpic resizer [$type; from $old_size pack(s) ($old_exp) into $new_size ($new_exp)]"; }