Merge pull request #8625 from annando/notice
Removed useless error handling
This commit is contained in:
commit
ba9d5b83e4
1 changed files with 0 additions and 4 deletions
|
@ -58,14 +58,12 @@ class Delivery
|
||||||
if ($cmd == self::MAIL) {
|
if ($cmd == self::MAIL) {
|
||||||
$target_item = DBA::selectFirst('mail', [], ['id' => $target_id]);
|
$target_item = DBA::selectFirst('mail', [], ['id' => $target_id]);
|
||||||
if (!DBA::isResult($target_item)) {
|
if (!DBA::isResult($target_item)) {
|
||||||
self::setFailedQueue($cmd, $target_item);
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
$uid = $target_item['uid'];
|
$uid = $target_item['uid'];
|
||||||
} elseif ($cmd == self::SUGGESTION) {
|
} elseif ($cmd == self::SUGGESTION) {
|
||||||
$target_item = DBA::selectFirst('fsuggest', [], ['id' => $target_id]);
|
$target_item = DBA::selectFirst('fsuggest', [], ['id' => $target_id]);
|
||||||
if (!DBA::isResult($target_item)) {
|
if (!DBA::isResult($target_item)) {
|
||||||
self::setFailedQueue($cmd, $target_item);
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
$uid = $target_item['uid'];
|
$uid = $target_item['uid'];
|
||||||
|
@ -75,7 +73,6 @@ class Delivery
|
||||||
} else {
|
} else {
|
||||||
$item = Model\Item::selectFirst(['parent'], ['id' => $target_id]);
|
$item = Model\Item::selectFirst(['parent'], ['id' => $target_id]);
|
||||||
if (!DBA::isResult($item) || empty($item['parent'])) {
|
if (!DBA::isResult($item) || empty($item['parent'])) {
|
||||||
self::setFailedQueue($cmd, $target_item);
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
$parent_id = intval($item['parent']);
|
$parent_id = intval($item['parent']);
|
||||||
|
@ -97,7 +94,6 @@ class Delivery
|
||||||
|
|
||||||
if (empty($target_item)) {
|
if (empty($target_item)) {
|
||||||
Logger::log('Item ' . $target_id . "wasn't found. Quitting here.");
|
Logger::log('Item ' . $target_id . "wasn't found. Quitting here.");
|
||||||
self::setFailedQueue($cmd, $target_item);
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue