[dw-free] inconsistent text when subscribing to self

[afuna]

[commit: http://hg.dwscoalition.org/dw-free/rev/8a5d236cc087]

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

Only show text if appropriate

Patch by wyntarvox.

Files modified:

• htdocs/manage/circle/add.bml

--------------------------------------------------------------------------------
diff -r 299baec97bdf -r 8a5d236cc087 htdocs/manage/circle/add.bml
--- a/htdocs/manage/circle/add.bml	Sat May 09 20:23:24 2009 +0000
+++ b/htdocs/manage/circle/add.bml	Sat May 09 20:42:08 2009 +0000
@@ -147,7 +147,8 @@
                $windowtitle = BML::ml('.confirm.title.person'.$add, {'user'=> $user });
                $title = BML::ml('.confirm.title.person'.$add, {'icon'=> $icon, 'user'=> $user });
             }
-            $body .= "<?p $ML{'.confirm.text1.person'} p?>";
+            $body .= "<?p $ML{'.confirm.text1.person'} p?>"
+                if $remote->can_trust( $u ) && $remote->can_watch( $u );
         }
     } elsif ( $trusted || $watched ) {
         $windowtitle = BML::ml( '.confirm.title.person', { user => $user } );
--------------------------------------------------------------------------------