Merge pull request #8632 from annando/fix-fatal

[friendica.git] / mod / message.php

diff --git a/mod/message.php b/mod/message.php
index e871e22e3140eb533d9c66e9a40e2c03b4ae632f..c024cbe144cd49eaaa31e80ee1f7064d6b6222c9 100644 (file)
--- 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;
                }