GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

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

This commit is contained in:
Evan Prodromou 2011-02-14 15:42:56 -05:00
parent a86d293c93 2b869fa23f
commit ffeb4af911
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
actions/backupaccount.php
View File

@ -149,7 +149,7 @@ class BackupaccountAction extends Action
*/
function isReadOnly($args)
{
return false;
return true;
}
/**

5
lib/activityobject.php
View File

@ -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);
}