Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x

[quix0rs-gnu-social.git] / plugins / Activity / ActivityPlugin.php

diff --git a/plugins/Activity/ActivityPlugin.php b/plugins/Activity/ActivityPlugin.php
index cd47427e0a97dee1f06a9378e8a9d784ebb27b1e..b21fa906530f31c48b5a8cbb308475c77a099ab3 100644 (file)
--- a/plugins/Activity/ActivityPlugin.php
+++ b/plugins/Activity/ActivityPlugin.php
@@ -84,7 +84,7 @@ class ActivityPlugin extends Plugin
         if (!empty($user)) {
                $sub = Subscription::pkeyGet(array('subscriber' => $subscriber->id,
                                                   'subscribed' => $other->id));
-            $rendered = sprintf(_m('<em><a href="%s">%s</a> started following <a href="%s">%s</a></em>.'),
+            $rendered = sprintf(_m('<a href="%s">%s</a> started following <a href="%s">%s</a>.'),
                                                $subscriber->profileurl,
                                                $subscriber->getBestName(),
                                 $other->profileurl,
@@ -114,7 +114,7 @@ class ActivityPlugin extends Plugin
         if(!$this->StopFollowUser) return true;
         $user = $subscriber->getUser();
         if (!empty($user)) {
-            $rendered = sprintf(_m('<em><a href="%s">%s</a> stopped following <a href="%s">%s</a></em>.'),
+            $rendered = sprintf(_m('<a href="%s">%s</a> stopped following <a href="%s">%s</a>.'),
                                                $subscriber->profileurl,
                                                $subscriber->getBestName(),
                                 $other->profileurl,
@@ -156,7 +156,7 @@ class ActivityPlugin extends Plugin
             $fave   = Fave::pkeyGet(array('user_id' => $user->id,
                                                                  'notice_id' => $notice->id));
             
-            $rendered = sprintf(_m('<em><a href="%s">%s</a> liked <a href="%s">%s\'s update</a></em>.'),
+            $rendered = sprintf(_m('<a href="%s">%s</a> liked <a href="%s">%s\'s update</a>.'),
                                                $profile->profileurl,
                                                $profile->getBestName(),
                                 $notice->bestUrl(),
@@ -189,7 +189,7 @@ class ActivityPlugin extends Plugin
 
         if (!empty($user)) {
             $author = Profile::staticGet('id', $notice->profile_id);
-            $rendered = sprintf(_m('<em><a href="%s">%s</a> stopped liking <a href="%s">%s\'s update</a></em>.'),
+            $rendered = sprintf(_m('<a href="%s">%s</a> stopped liking <a href="%s">%s\'s update</a>.'),
                                                $profile->profileurl,
                                                $profile->getBestName(),
                                 $notice->bestUrl(),
@@ -230,7 +230,7 @@ class ActivityPlugin extends Plugin
             return true;
         }
         
-        $rendered = sprintf(_m('<em><a href="%s">%s</a> joined the group <a href="%s">%s</a></em>.'),
+        $rendered = sprintf(_m('<a href="%s">%s</a> joined the group <a href="%s">%s</a>.'),
                                        $profile->profileurl,
                                        $profile->getBestName(),
                             $group->homeUrl(),
@@ -267,7 +267,7 @@ class ActivityPlugin extends Plugin
             return true;
         }
         
-        $rendered = sprintf(_m('<em><a href="%s">%s</a> left the group <a href="%s">%s</a></em>.'),
+        $rendered = sprintf(_m('<a href="%s">%s</a> left the group <a href="%s">%s</a>.'),
                                        $profile->profileurl,
                                        $profile->getBestName(),
                             $group->homeUrl(),