Commit ffeb4af9 authored by Evan Prodromou's avatar Evan Prodromou

Merge remote branch 'origin/master' into 0.9.x

parents a86d293c 2b869fa2
......@@ -149,7 +149,7 @@ class BackupaccountAction extends Action
*/
function isReadOnly($args)
{
return false;
return true;
}
/**
......
......@@ -546,7 +546,10 @@ class ActivityObject
if (!empty($this->title)) {
$name = common_xml_safe_str($this->title);
if ($tag == 'author') {
$xo->element(self::NAME, null, $name);
// XXX: Backward compatibility hack -- atom:name should contain
// full name here, instead of nickname, i.e.: $name. Change
// this in the next version.
$xo->element(self::NAME, null, $this->poco->preferredUsername);
} else {
$xo->element(self::TITLE, null, $name);
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment