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

Skip on already-exists error

This commit is contained in:
Evan Prodromou 2012-06-17 09:52:35 -04:00
parent 2c70680b24
commit f5af67ce68
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
plugins/Bookmark/deliciousbookmarkimporter.php
View File

@ -75,10 +75,17 @@ class DeliciousBookmarkImporter extends QueueHandler
$data['description'],
array('created' => $data['created'],
'distribute' => false));
} catch (ClientException $e) {
} catch (ClientException $ce) {
// Most likely a duplicate -- continue on with the rest!
common_log(LOG_ERR, "Error importing delicious bookmark to $data[url]: " . $e->getMessage());
common_log(LOG_ERR, "Error importing delicious bookmark to $data[url]: " . $ce->getMessage());
return true;
} catch (Exception $ex) {
if (preg_match("/DB Error: already exists/", $ex->getMessage())) {
common_log(LOG_ERR, "Error importing delicious bookmark to $data[url]: " . $ce->getMessage());
return true;
} else {
throw $ex;
}
}
return true;