X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fping.php;h=69aef1bf3fd54bda79b04c9c8213e7e54e8d1c74;hb=2a442952b69987d578288891c064b0fed0369086;hp=146e7e75b57de6519d86adb0da61c11c33ad05c9;hpb=bb222209bc723ca5135f612304e1b0fbe76beddd;p=friendica.git

diff --git a/mod/ping.php b/mod/ping.php
index 146e7e75b5..69aef1bf3f 100644
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -193,7 +193,7 @@ function ping_init(App $a)
 		$intro_count = count($intros1) + count($intros2);
 		$intros = $intros1 + $intros2;
 
-		$myurl = DI::baseUrl() . '/profile/' . $a->user['nickname'];
+		$myurl = DI::baseUrl() . '/profile/' . $a->getLoggedInUserNickname();
 		$mails = q(
 			"SELECT `id`, `from-name`, `from-url`, `from-photo`, `created` FROM `mail`
 			WHERE `uid` = %d AND `seen` = 0 AND `from-url` != '%s' ",
@@ -230,7 +230,7 @@ function ping_init(App $a)
 			$all_events = count($ev);
 
 			if ($all_events) {
-				$str_now = DateTimeFormat::timezoneNow($a->timezone, 'Y-m-d');
+				$str_now = DateTimeFormat::timezoneNow($a->getTimeZone(), 'Y-m-d');
 				foreach ($ev as $x) {
 					$bd = false;
 					if ($x['type'] === 'birthday') {
@@ -239,7 +239,7 @@ function ping_init(App $a)
 					} else {
 						$events ++;
 					}
-					if (DateTimeFormat::convert($x['start'], ((intval($x['adjust'])) ? $a->timezone : 'UTC'), 'UTC', 'Y-m-d') === $str_now) {
+					if (DateTimeFormat::convert($x['start'], ((intval($x['adjust'])) ? $a->getTimeZone() : 'UTC'), 'UTC', 'Y-m-d') === $str_now) {
 						$all_events_today ++;
 						if ($bd) {
 							$birthdays_today ++;
@@ -459,13 +459,13 @@ function ping_get_notifications($uid)
 
 			if ($notification["visible"]
 				&& !$notification["deleted"]
-				&& empty($result[$notification['parent']])
+				&& empty($result['p:' . $notification['parent']])
 			) {
 				// Should we condense the notifications or show them all?
-				if (DI::pConfig()->get(local_user(), 'system', 'detailed_notif')) {
-					$result[$notification["id"]] = $notification;
+				if (($notification['verb'] != Activity::POST) || DI::pConfig()->get(local_user(), 'system', 'detailed_notif')) {
+					$result[] = $notification;
 				} else {
-					$result[$notification['parent']] = $notification;
+					$result['p:' . $notification['parent']] = $notification;
 				}
 			}
 		}