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 1a460219dc51e62aad5058572bf2c9eeeb3deb82..b21fa906530f31c48b5a8cbb308475c77a099ab3 100644 (file)
--- a/plugins/Activity/ActivityPlugin.php
+++ b/plugins/Activity/ActivityPlugin.php
@@ -99,6 +99,7 @@ class ActivityPlugin extends Plugin
                                       $content,
                                       ActivityPlugin::SOURCE,
                                       array('rendered' => $rendered,
+                                            'urls' => array(),
                                             'replies' => array($other->getUri()),
                                                'verb' => ActivityVerb::FOLLOW,
                                                'object_type' => ActivityObject::PERSON,
@@ -133,6 +134,7 @@ class ActivityPlugin extends Plugin
                                       $content,
                                       ActivityPlugin::SOURCE,
                                       array('rendered' => $rendered,
+                                            'urls' => array(),
                                             'replies' => array($other->getUri()),
                                                'uri' => $uri,
                                                'verb' => ActivityVerb::UNFOLLOW,
@@ -169,6 +171,7 @@ class ActivityPlugin extends Plugin
                                       $content,
                                       ActivityPlugin::SOURCE,
                                       array('rendered' => $rendered,
+                                            'urls' => array(),
                                             'replies' => array($author->getUri()),
                                                'uri' => $fave->getURI(),
                                                'verb' => ActivityVerb::FAVORITE,
@@ -206,6 +209,7 @@ class ActivityPlugin extends Plugin
                                       $content,
                                       ActivityPlugin::SOURCE,
                                       array('rendered' => $rendered,
+                                            'urls' => array(),
                                             'replies' => array($author->getUri()),
                                                'uri' => $uri,
                                                'verb' => ActivityVerb::UNFAVORITE,
@@ -244,6 +248,7 @@ class ActivityPlugin extends Plugin
                                   $content,
                                   ActivityPlugin::SOURCE,
                                   array('rendered' => $rendered,
+                                        'urls' => array(),
                                         'groups' => array($group->id),
                                                'uri' => $mem->getURI(),
                                                'verb' => ActivityVerb::JOIN,
@@ -282,6 +287,7 @@ class ActivityPlugin extends Plugin
                                   $content,
                                   ActivityPlugin::SOURCE,
                                   array('rendered' => $rendered,
+                                        'urls' => array(),
                                         'groups' => array($group->id),
                                                'uri' => $uri,
                                                'verb' => ActivityVerb::LEAVE,