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

diff --git a/actions/backupaccount.php b/actions/backupaccount.php
index 77948267606bfc823221e7a352e4c311fc076733..928aba69ceba2013d51d1518cb963a37a308acc8 100644 (file)
--- a/actions/backupaccount.php
+++ b/actions/backupaccount.php
@@ -149,7 +149,7 @@ class BackupaccountAction extends Action
      */
     function isReadOnly($args)
     {
-        return false;
+        return true;
     }
 
     /**

diff --git a/lib/activityobject.php b/lib/activityobject.php
index f774dd3c8bc0abdf35d1d474e4cfbb45628358b7..5898c6d05060558b591273cfa28f0c12a8108e58 100644 (file)
--- a/lib/activityobject.php
+++ b/lib/activityobject.php
@@ -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);
             }