[dw-free] Use common logic for user link bar on profile page and in S2

[afuna]

[commit: http://hg.dwscoalition.org/dw-free/rev/137a7ed41308]

http://bugs.dwscoalition.org/show_bug.cgi?id=400

Add access/subscribe actions back to links

Patch by afuna.

Files modified:

• cgi-bin/DW/Logic/UserLinkBar.pm

--------------------------------------------------------------------------------
diff -r 05794710c499 -r 137a7ed41308 cgi-bin/DW/Logic/UserLinkBar.pm
--- a/cgi-bin/DW/Logic/UserLinkBar.pm	Fri Mar 06 19:22:56 2009 +0000
+++ b/cgi-bin/DW/Logic/UserLinkBar.pm	Fri Mar 06 19:27:15 2009 +0000
@@ -194,7 +194,7 @@ sub trust {
         my $remote_trusts = $remote && $remote->trusts( $u ) ? 1 : 0;
         $link->{text_ml} = $remote_trusts ? 'userlinkbar.modifytrust' : 'userlinkbar.addtrust';
         if ( $remote && ( $remote_trusts || $u->is_visible ) ) {
-            $link->{url} = "manage/circle/add.bml?user=$user";
+            $link->{url} = "manage/circle/add.bml?user=$user&action=access";
             $link->{title_ml} = $remote_trusts ? 'userlinkbar.modifytrust.title.other' : 'userlinkbar.addtrust.title.other';
             $link->{class} = "addtrust";
             $link->{image} = 'add-friend.gif';
@@ -226,7 +226,7 @@ sub watch {
     my $remote_watches = $remote && $remote->watches( $u ) ? 1 : 0;
     $link->{text_ml} = $remote_watches ? 'userlinkbar.modifysub' : 'userlinkbar.addsub';
     if ( $remote && ( $remote_watches || $u->is_visible ) ) {
-        $link->{url} = "manage/circle/add.bml?user=$user";
+        $link->{url} = "manage/circle/add.bml?user=$user&action=subscribe";
 
         if ( $remote->equals( $u ) ) {
             $link->{title_ml} = $remote_watches ? 'userlinkbar.modifysub.title.self' : 'userlinkbar.addsub.title.self';
--------------------------------------------------------------------------------