Merge remote branch 'gitorious/0.9.x' into 1.0.x

Conflicts: lib/common.php
2010-12-30 15:52:08 -08:00
parent e211e6228d c91b080a8e
commit 32eb4c5e2d
37 changed files with 3034 additions and 107 deletions
--- a/plugins/OStatus/OStatusPlugin.php
+++ b/plugins/OStatus/OStatusPlugin.php
@@ -145,12 +145,10 @@ class OStatusPlugin extends Plugin
            $user = $feed->getUser();
            $id   = $user->id;
            $profile = $user->getProfile();
-            $feed->setActivitySubject($profile->asActivityNoun('subject'));
        } else if ($feed instanceof AtomGroupNoticeFeed) {
            $salmonAction = 'groupsalmon';
            $group = $feed->getGroup();
            $id = $group->id;
-            $feed->setActivitySubject($group->asActivitySubject());
        } else {
            return true;
        }