From: Evan Prodromou <evan@status.net>
Date: Mon, 14 Feb 2011 20:42:56 +0000 (-0500)
Subject: Merge remote branch 'origin/master' into 0.9.x
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=ffeb4af911b42c41b0a201851fb43d843c2a89f0;hp=a86d293c9327057fb7d4a8c9c376967227d20178;p=quix0rs-gnu-social.git

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

diff --git a/actions/backupaccount.php b/actions/backupaccount.php
index 7794826760..928aba69ce 100644
--- 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 f774dd3c8b..5898c6d050 100644
--- 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);
             }