X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mod%2Fnotify.php;h=b4d60a747c0bb5fcf871f9775c8fb8b909e5932c;hb=159a7bda85d1514ed3a8d67cea7deca6ed96b437;hp=e6a7a885966418d35c9dcf163410c8dfe74e1cfe;hpb=b71a3af4570ccf349804b9ffa151fc1d35287d88;p=friendica.git

diff --git a/mod/notify.php b/mod/notify.php
index e6a7a88596..b4d60a747c 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 id = %d and uid = %d limit 1",
-				intval($a->argv[2]),
+			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'])
@@ -59,7 +61,7 @@ function notify_content(&$a) {
 			$notif_content .= t('No more system notifications.');
 		}
 		
-		$o .= replace_macros($notif_tpl,array(
+		$o .= replace_macros($notif_tpl, array(
 			'$notif_header' => t('System Notifications'),
 			'$tabs' => '', // $tabs,
 			'$notif_content' => $notif_content,
@@ -68,4 +70,4 @@ function notify_content(&$a) {
 	return $o;
 
 
-}
\ No newline at end of file
+}