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

Commit 8eac5d26 authored by Evan Prodromou's avatar Evan Prodromou

Merge branch 'testing' into 1.0.x

parents 2f175156 11f20788
......@@ -74,7 +74,13 @@ class DeliciousBackupImporter extends QueueHandler
{
list($user, $body) = $data;
$doc = $this->importHTML($body);
try {
$doc = $this->importHTML($body);
} catch (ClientException $cex) {
// XXX: message to the user
common_log(LOG_WARNING, $cex->getMessage());
return true;
}
// If we can't parse it, it's no good
......@@ -85,8 +91,9 @@ class DeliciousBackupImporter extends QueueHandler
$dls = $doc->getElementsByTagName('dl');
if ($dls->length != 1) {
// TRANS: Client exception thrown when a file upload is incorrect.
throw new ClientException(_m('Bad import file.'));
// XXX: message to the user
common_log(LOG_WARNING, 'Bad input file');
return true;
}
$dl = $dls->item(0);
......
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