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

Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x

Browse Source
This commit is contained in:
Evan Prodromou 2010-12-22 12:03:14 -08:00
commit a01742244e
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
actions/backupaccount.php
View File

@ -97,7 +97,7 @@ class BackupaccountAction extends Action
function handle($argarray=null) function handle($argarray=null)
{ {
parent::handle($args); parent::handle($argarray);
if ($this->isPost()) { if ($this->isPost()) {
$this->sendFeed(); $this->sendFeed();

14
actions/restoreaccount.php
View File

@ -95,7 +95,7 @@ class RestoreaccountAction extends Action
function handle($argarray=null) function handle($argarray=null)
{ {
parent::handle($args); parent::handle($argarray);
if ($this->isPost()) { if ($this->isPost()) {
$this->restoreAccount(); $this->restoreAccount();
@ -143,6 +143,7 @@ class RestoreaccountAction extends Action
return; return;
case UPLOAD_ERR_NO_FILE: case UPLOAD_ERR_NO_FILE:
// No file; probably just a non-AJAX submission. // No file; probably just a non-AJAX submission.
throw new ClientException(_('No uploaded file.'));
return; return;
case UPLOAD_ERR_NO_TMP_DIR: case UPLOAD_ERR_NO_TMP_DIR:
// TRANS: Client exception thrown when a temporary folder is not present to store a file upload. // TRANS: Client exception thrown when a temporary folder is not present to store a file upload.
@ -185,12 +186,19 @@ class RestoreaccountAction extends Action
// This check is costly but we should probably give // This check is costly but we should probably give
// the user some info ahead of time. // the user some info ahead of time.
$doc = new DOMDocument();
$doc = DOMDocument::loadXML($xml); // Disable PHP warnings so we don't spew low-level XML errors to output...
// would be nice if we can just get exceptions instead.
$old_err = error_reporting();
error_reporting($old_err & ~E_WARNING);
$doc->loadXML($xml);
error_reporting($old_err);
$feed = $doc->documentElement; $feed = $doc->documentElement;
if ($feed->namespaceURI != Activity::ATOM || if (!$feed ||
$feed->namespaceURI != Activity::ATOM ||
$feed->localName != 'feed') { $feed->localName != 'feed') {
throw new ClientException(_("Not an atom feed.")); throw new ClientException(_("Not an atom feed."));
} }