Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x

This commit is contained in:
Evan Prodromou
2010-01-10 14:18:54 -08:00
139 changed files with 14338 additions and 14520 deletions

View File

@@ -789,7 +789,7 @@ class ApiAction extends Action
$from = $message->getFrom();
$entry['title'] = sprintf('Message from %s to %s',
$entry['title'] = sprintf('Message from %1$s to %2$s',
$from->nickname, $message->getTo()->nickname);
$entry['content'] = common_xml_safe_str($message->rendered);