Committer: sbelyaev
LJSUP-12218: Wishlist flagU trunk/bin/upgrading/en_LJ.dat U trunk/cgi-bin/LJ/Hooks/ESN.pm U trunk/cgi-bin/LJ/Hooks/Userinfo.pm
Modified: trunk/bin/upgrading/en_LJ.dat =================================================================== --- trunk/bin/upgrading/en_LJ.dat 2012-05-16 07:24:18 UTC (rev 11966) +++ trunk/bin/upgrading/en_LJ.dat 2012-05-16 11:02:47 UTC (rev 11967) @@ -14435,6 +14435,9 @@ widget.wishlist.view_full|staleness=1 widget.wishlist.view_full=View full wishlist +wishlist.disabled|staleness=1 +wishlist.disabled=Sorry, but wishlist is disabled + xcolibur.greeting.anon=Welcome to LiveJournal! xcolibur.greeting.logged_in=Welcome, [[name]]! [[logout]] Modified: trunk/cgi-bin/LJ/Hooks/ESN.pm =================================================================== --- trunk/cgi-bin/LJ/Hooks/ESN.pm 2012-05-16 07:24:18 UTC (rev 11966) +++ trunk/cgi-bin/LJ/Hooks/ESN.pm 2012-05-16 11:02:47 UTC (rev 11967) @@ -266,7 +266,7 @@ 'Befriended-u', 'Defriended-u', 'UserMessageRecvd-u', - (LJ::SUP->is_sup_enabled($remote) ? ('WishList', 'WishListExpire') : ()), + (LJ::is_enabled('wishlist_v2') && LJ::SUP->is_sup_enabled($remote) ? ('WishList', 'WishListExpire') : ()), 'GiveFeatures', ]; } Modified: trunk/cgi-bin/LJ/Hooks/Userinfo.pm =================================================================== --- trunk/cgi-bin/LJ/Hooks/Userinfo.pm 2012-05-16 07:24:18 UTC (rev 11966) +++ trunk/cgi-bin/LJ/Hooks/Userinfo.pm 2012-05-16 11:02:47 UTC (rev 11967) @@ -300,7 +300,7 @@ my $wishes = LJ::WishList->load_profile($u); if (@$wishes) { my $ulink = $u->journal_base; - if ($with_header) { + if ($with_header && LJ::is_enabled('wishlist_v2')) { $$r .= "<div class='section$extra_section_class'><span class='expandcollapse on' id='wishes_header'>"; $$r .= "<img id='wishes_arrow' src='$LJ::IMGPREFIX/profile_icons/arrow-down.gif?v=14408' align='absmiddle' /> " . LJ::Lang::ml('ljcom.userinfo.wishes.header'); $$r .= "</span> <span class='section_link'>[<a href='$ulink/wishlist'>" . LJ::Lang::ml('ljcom.userinfo.wishes.viewall') . "</a>]</span></div>";