X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fmessage.php;h=c024cbe144cd49eaaa31e80ee1f7064d6b6222c9;hb=aedbb0d627606ff7eb7302e2881c31059b6cc1d9;hp=e871e22e3140eb533d9c66e9a40e2c03b4ae632f;hpb=e80d68ba53776bed047d897f52db7e25b35a479d;p=friendica.git diff --git a/mod/message.php b/mod/message.php index e871e22e31..c024cbe144 100644 --- a/mod/message.php +++ b/mod/message.php @@ -296,7 +296,7 @@ function message_content(App $a) $total = $r[0]['total']; } - $pager = new Pager(DI::args()->getQueryString()); + $pager = new Pager(DI::l10n(), DI::args()->getQueryString()); $r = get_messages(local_user(), $pager->getStart(), $pager->getItemsPerPage()); @@ -352,13 +352,7 @@ function message_content(App $a) $messages = DBA::toArray($messages_stmt); DBA::update('mail', ['seen' => 1], ['parent-uri' => $message['parent-uri'], 'uid' => local_user()]); - - if ($message['convid']) { - // Clear Diaspora private message notifications - DBA::update('notify', ['seen' => 1], ['type' => Type::MAIL, 'parent' => $message['convid'], 'uid' => local_user()]); - } - // Clear DFRN private message notifications - DBA::update('notify', ['seen' => 1], ['type' => Type::MAIL, 'parent' => $message['parent-uri'], 'uid' => local_user()]); + DBA::update('notify', ['seen' => 1], ['type' => Type::MAIL, 'parent' => $message['id'], 'uid' => local_user()]); } else { $messages = false; }