X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FNotifications%2FPing.php;h=df75c047afdd8b8c25d8f135743710db1e930786;hb=46660c94628bdbad2ce9b36368bb55df120497d3;hp=2eaa2c4a5ca274faf6ce52e69a82ffe38f797396;hpb=0c92610f6c0e10563ca8ca06a07bd1c2f389d4c9;p=friendica.git diff --git a/src/Module/Notifications/Ping.php b/src/Module/Notifications/Ping.php index 2eaa2c4a5c..df75c047af 100644 --- a/src/Module/Notifications/Ping.php +++ b/src/Module/Notifications/Ping.php @@ -48,6 +48,7 @@ use Friendica\Navigation\Notifications\Factory; use Friendica\Navigation\Notifications\Repository; use Friendica\Navigation\Notifications\ValueObject; use Friendica\Navigation\SystemMessages; +use Friendica\Network\HTTPException; use Friendica\Protocol\Activity; use Friendica\Util\DateTimeFormat; use Friendica\Util\Profiler; @@ -229,27 +230,27 @@ class Ping extends BaseModule // merge all notification types in one array foreach ($intros as $intro) { - $navNotifications[] = $this->formattedNavNotification->createFromIntro($intro); + try { + $navNotifications[] = $this->formattedNavNotification->createFromIntro($intro); + } catch (HTTPException\NotFoundException $e) { + $this->introductionRepo->delete($intro); + } } if (count($registrations) <= 1 || $this->pconfig->get($this->session->getLocalUserId(), 'system', 'detailed_notif')) { - foreach ($registrations as $reg) { + foreach ($registrations as $registration) { $navNotifications[] = $this->formattedNavNotification->createFromParams( - [ - 'name' => $reg['name'], - 'url' => $reg['url'], - ], + $registration['name'], + $registration['url'], $this->l10n->t('{0} requested registration'), - new \DateTime($reg['created'], new \DateTimeZone('UTC')), + new \DateTime($registration['created'], new \DateTimeZone('UTC')), new Uri($this->baseUrl->get(true) . '/moderation/users/pending') ); } - } elseif (count($registrations) > 1) { + } else { $navNotifications[] = $this->formattedNavNotification->createFromParams( - [ - 'name' => $registrations[0]['name'], - 'url' => $registrations[0]['url'], - ], + $registrations[0]['name'], + $registrations[0]['url'], $this->l10n->t('{0} and %d others requested registration', count($registrations) - 1), new \DateTime($registrations[0]['created'], new \DateTimeZone('UTC')), new Uri($this->baseUrl->get(true) . '/moderation/users/pending')