Merge pull request #12364 from MrPetovan/bug/warnings

[friendica.git] / src / Module / Notifications / Ping.php

diff --git a/src/Module/Notifications/Ping.php b/src/Module/Notifications/Ping.php
index e80d3b8ee03f3c97c172daeed7d2a1f9db4b7e1e..df75c047afdd8b8c25d8f135743710db1e930786 100644 (file)
--- 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,30 +230,30 @@ 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 Uri($this->baseUrl->get(true) . '/admin/users/pending')
+                                               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) . '/admin/users/pending')
+                                       new Uri($this->baseUrl->get(true) . '/moderation/users/pending')
                                );
                        }