X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdisplay.php;h=ef835848eadda17c72361e552581e80ceebc8383;hb=3972fe62fe8afb3791e9d6526e7665501a577b81;hp=d4651703219eac7af3ecb7c33cc4d19ee4c47fcb;hpb=96055cafffe3939d3ede573e54bfa05eb178fdb6;p=friendica.git diff --git a/mod/display.php b/mod/display.php index d465170321..ef835848ea 100644 --- a/mod/display.php +++ b/mod/display.php @@ -173,7 +173,7 @@ function display_content(App $a, $update = false, $update_uid = 0) if ($update) { $uri_id = $_REQUEST['uri_id']; - $item = Post::selectFirst(['uid', 'parent-uri-id'], ['uri-id' => $uri_id, 'uid' => [0, $update_uid]]); + $item = Post::selectFirst(['uid', 'parent-uri-id'], ['uri-id' => $uri_id, 'uid' => [0, $update_uid]], ['order' => ['uid' => true]]); if (!empty($item)) { if ($item['uid'] != 0) { $a->setProfileOwner($item['uid']); @@ -190,8 +190,8 @@ function display_content(App $a, $update = false, $update_uid = 0) $fields = ['uri-id', 'parent-uri-id', 'uid']; if (local_user()) { - $condition = ['guid' => DI::args()->getArgv()[1], 'uid' => local_user()]; - $item = Post::selectFirstForUser(local_user(), $fields, $condition); + $condition = ['guid' => DI::args()->getArgv()[1], 'uid' => [0, local_user()]]; + $item = Post::selectFirstForUser(local_user(), $fields, $condition, ['order' => ['uid' => true]]); if (DBA::isResult($item)) { $uri_id = $item['uri-id']; $parent_uri_id = $item['parent-uri-id']; @@ -222,8 +222,8 @@ function display_content(App $a, $update = false, $update_uid = 0) } if (!DI::pConfig()->get(local_user(), 'system', 'detailed_notif')) { - DBA::update('notification', ['seen' => true], ['parent-uri-id' => $item['parent-uri-id'], 'uid' => local_user()]); - DBA::update('notify', ['seen' => true], ['parent-uri-id' => $item['parent-uri-id'], 'uid' => local_user()]); + DI::notification()->setAllSeenForUser(local_user(), ['parent-uri-id' => $item['parent-uri-id']]); + DI::notify()->setAllSeenForUser(local_user(), ['parent-uri-id' => $item['parent-uri-id']]); } // We are displaying an "alternate" link if that post was public. See issue 2864 @@ -246,7 +246,7 @@ function display_content(App $a, $update = false, $update_uid = 0) $page_uid = 0; $parent = null; - if (!empty($parent_uri_id)) { + if (!local_user() && !empty($parent_uri_id)) { $parent = Post::selectFirst(['uid'], ['uri-id' => $parent_uri_id, 'wall' => true]); }