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

Merge branch 'testing' into 1.0.x

This commit is contained in:
Evan Prodromou 2011-08-22 13:20:40 -04:00
parent 2f1751568a 11f2078893
commit 8eac5d2638
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
plugins/Bookmark/deliciousbackupimporter.php
View File

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