We are no longer offering accounts on this server. Consider https://gitlab.freedesktop.org/ as a place to host projects.

Commit a0174224 authored by Evan Prodromou's avatar Evan Prodromou

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

parents 3e82000d 05563051
...@@ -97,7 +97,7 @@ class BackupaccountAction extends Action ...@@ -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();
......
...@@ -95,7 +95,7 @@ class RestoreaccountAction extends Action ...@@ -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 ...@@ -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 ...@@ -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."));
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment