Merge commit 'refs/merge-requests/158' of git://gitorious.org/statusnet/mainline...

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

diff --git a/plugins/Activity/ActivityPlugin.php b/plugins/Activity/ActivityPlugin.php
index 5801c194a6de99b9371f47e8eab091857a65ff5f..aa718d079e6d044ae4907f7cea942f29c803d1ec 100644 (file)
--- a/plugins/Activity/ActivityPlugin.php
+++ b/plugins/Activity/ActivityPlugin.php
@@ -47,15 +47,15 @@ if (!defined('STATUSNET')) {
 class ActivityPlugin extends Plugin
 {
     const VERSION = '0.1';
-    const SOURCE  = 'system';
+    const SOURCE  = 'activity';
 
     // Flags to switch off certain activity notices
     public $StartFollowUser = true;
-    public $StopFollowUser  = true;
+    public $StopFollowUser  = false;
     public $JoinGroup = true;
-    public $LeaveGroup = true;
-    public $StartLike = true;
-    public $StopLike = true;
+    public $LeaveGroup = false;
+    public $StartLike = false;
+    public $StopLike = false;
 
     function onAutoload($cls)
     {
@@ -86,7 +86,7 @@ class ActivityPlugin extends Plugin
             // TRANS: Text for "started following" item in activity plugin.
             // TRANS: %1$s is a profile URL, %2$s is a profile name,
             // TRANS: %3$s is a profile URL, %4$s is a profile name.
-            $rendered = sprintf(_m('<a href="%1$s">%2$s</a> started following <a href="%2$s">%4$s</a>.'),
+            $rendered = sprintf(_m('<a href="%1$s">%2$s</a> started following <a href="%3$s">%4$s</a>.'),
                                 $subscriber->profileurl,
                                 $subscriber->getBestName(),
                                 $other->profileurl,