Merge pull request #9517 from annando/no-duplicated

[friendica.git] / mod / ping.php

diff --git a/mod/ping.php b/mod/ping.php
index 5e6c478f7d6d390a04ccb615150ef096237b6d18..8e00ae31f177235a7e3be2be73747c881f9b3bab 100644 (file)
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -289,16 +289,30 @@ function ping_init(App $a)
                }
 
                if (DBA::isResult($regs)) {
-                       foreach ($regs as $reg) {
+                       if (count($regs) <= 1 || DI::pConfig()->get(local_user(), 'system', 'detailed_notif')) {
+                               foreach ($regs as $reg) {
+                                       $notif = [
+                                               'id'      => 0,
+                                               'href'    => DI::baseUrl() . '/admin/users/pending',
+                                               'name'    => $reg['name'],
+                                               'url'     => $reg['url'],
+                                               'photo'   => $reg['micro'],
+                                               'date'    => $reg['created'],
+                                               'seen'    => false,
+                                               'message' => DI::l10n()->t('{0} requested registration'),
+                                       ];
+                                       $notifs[] = $notif;
+                               }
+                       } else {
                                $notif = [
                                        'id'      => 0,
                                        'href'    => DI::baseUrl() . '/admin/users/pending',
-                                       'name'    => $reg['name'],
-                                       'url'     => $reg['url'],
-                                       'photo'   => $reg['micro'],
-                                       'date'    => $reg['created'],
+                                       'name'    => $regs[0]['name'],
+                                       'url'     => $regs[0]['url'],
+                                       'photo'   => $regs[0]['micro'],
+                                       'date'    => $regs[0]['created'],
                                        'seen'    => false,
-                                       'message' => DI::l10n()->t('{0} requested registration'),
+                                       'message' => DI::l10n()->t('{0} and %d others requested registration', count($regs) - 1),
                                ];
                                $notifs[] = $notif;
                        }