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

This commit is contained in:
Evan Prodromou
2011-07-15 17:46:19 -04:00
49 changed files with 606 additions and 186 deletions

View File

@@ -330,7 +330,7 @@ class BookmarkPlugin extends MicroAppPlugin
$options = array('uri' => $bookmark->id,
'url' => $bookmark->link,
'is_local' => Notice::REMOTE_OMB,
'is_local' => Notice::REMOTE,
'source' => 'ostatus');
return self::_postBookmark($author->localProfile(), $activity, $options);