[livejournal] r23212: LJSUP-13797: Friends lists - changed con...

U   trunk/cgi-bin/LJ/User.pm

Modified: trunk/cgi-bin/LJ/User.pm
===================================================================
--- trunk/cgi-bin/LJ/User.pm	2012-10-29 13:18:30 UTC (rev 23211)
+++ trunk/cgi-bin/LJ/User.pm	2012-10-29 13:19:40 UTC (rev 23212)
@@ -2107,16 +2107,21 @@
             $url = "$LJ::SITEROOT/userinfo.bml?userid=$u->{'userid'}&t=I";
             $url .= "&mode=full" if $opts{full};
         } else {
-            $url = "$LJ::SITEROOT/profile?userid=$u->{'userid'}&t=I";
+            $url = "$LJ::SITEROOT/profile";
+            $url .= "/friendlist" if $opts{'friendlist'};
+            $url .= "?userid=$u->{'userid'}&t=I";
             $url .= "&mode=full" if $opts{full};
         }
     } else {
         $url = $u->journal_base . "/profile";
+        $url .= "/friendlist" if $opts{'friendlist'};
         $url .= "?mode=full" if $opts{full};
     }
     return $url;
 }
 
+
+
 sub addfriend_url {
     my $u = shift;
     croak "invalid user object passed" unless LJ::isu($u);
@@ -2130,7 +2135,7 @@
     croak "invalid user object passed" unless LJ::isu($u);
     my $item = $opts->{item} ? delete $opts->{item} : '';
 
-    return "$LJ::SITEROOT/shop/vgift.bml?to=$u->{'user'}";
+    return "$LJ::SITEROOT/shop/view.bml?item=$item&gift=1&for=$u->{'user'}";
 }
 
 # return the URL to the send message page