X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mod%2Fnotify.php;h=ae8273a1d3eda064c7a7b2f5697162e3955f018c;hb=6df74b8cd96c4ea9df2c396d2b8ea46162eccc4d;hp=16b87b76f5e7797d1c51ec4e5ba8ef317f025583;hpb=84d5f495e6e6edd7114b7e72711035e96479e39a;p=friendica.git diff --git a/mod/notify.php b/mod/notify.php index 16b87b76f5..ae8273a1d3 100644 --- a/mod/notify.php +++ b/mod/notify.php @@ -11,14 +11,16 @@ function notify_init(&$a) { intval(local_user()) ); if(count($r)) { - q("update notify set seen = 1 where link = '%s' and uid = %d", + q("update notify set seen = 1 where ( link = '%s' or ( parent != 0 and parent = %d and otype = '%s' )) and uid = %d", dbesc($r[0]['link']), + intval($r[0]['parent']), + dbesc($r[0]['otype']), intval(local_user()) ); goaway($r[0]['link']); } - goaway($a->get_baseurl()); + goaway($a->get_baseurl(true)); } if($a->argc > 2 && $a->argv[1] === 'mark' && $a->argv[2] === 'all' ) { @@ -49,7 +51,7 @@ function notify_content(&$a) { if (count($r) > 0) { foreach ($r as $it) { $notif_content .= replace_macros($not_tpl,array( - '$item_link' => $a->get_baseurl().'/notify/view/'. $it['id'], + '$item_link' => $a->get_baseurl(true).'/notify/view/'. $it['id'], '$item_image' => $it['photo'], '$item_text' => strip_tags(bbcode($it['msg'])), '$item_when' => relative_date($it['date'])