Merge branch 'master' of https://git.gnu.io/gnu/gnu-social into social-master

[quix0rs-gnu-social.git] / actions / backupaccount.php

diff --git a/actions/backupaccount.php b/actions/backupaccount.php
index 928aba69ceba2013d51d1518cb963a37a308acc8..4d7b6fcfcd653f4ed2b5f0d978b3ed83ffb5e9f4 100644 (file)
--- a/actions/backupaccount.php
+++ b/actions/backupaccount.php
@@ -58,7 +58,7 @@ class BackupaccountAction extends Action
     function title()
     {
         // TRANS: Title for backup account page.
-        return _("Backup account");
+        return _('Backup account');
     }
 
     /**
@@ -118,11 +118,13 @@ class BackupaccountAction extends Action
     {
         $cur = common_current_user();
 
-        $stream = new UserActivityStream($cur);
+        $stream = new UserActivityStream($cur, true, UserActivityStream::OUTPUT_RAW);
 
         header('Content-Disposition: attachment; filename='.$cur->nickname.'.atom');
         header('Content-Type: application/atom+xml; charset=utf-8');
 
+        // @fixme atom feed logic is in getString...
+        // but we just want it to output to the outputter.
         $this->raw($stream->getString());
     }
 
@@ -147,7 +149,7 @@ class BackupaccountAction extends Action
      *
      * @return boolean is read only action?
      */
-    function isReadOnly($args)
+    function isReadOnly(array $args=array())
     {
         return true;
     }
@@ -249,6 +251,6 @@ class BackupAccountForm extends Form
                            'submit',
                            null,
                            // TRANS: Title for submit button to backup an account on the backup account page.
-                           _('Backup your account'));
+                           _('Backup your account.'));
     }
 }