From: Philipp <admin+Github@philipp.info>
Date: Sun, 26 Jan 2020 22:10:56 +0000 (+0100)
Subject: Merge pull request #8179 from MrPetovan/bug/notices
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=9827e933a2a1b8e93f293d4e6293384126e5784c;p=friendica.git

Merge pull request #8179 from MrPetovan/bug/notices

Various notice fixes
---

9827e933a2a1b8e93f293d4e6293384126e5784c
diff --cc mod/display.php
index 8be5520138,9ec7e05cae..582bcde28e
--- a/mod/display.php
+++ b/mod/display.php
@@@ -96,13 -96,13 +96,13 @@@ function display_init(App $a
  
  	$profiledata = display_fetchauthor($a, $item);
  
- 	if (strstr(Strings::normaliseLink($profiledata["url"]), Strings::normaliseLink(DI::baseUrl()))) {
- 		$nickname = str_replace(Strings::normaliseLink(DI::baseUrl())."/profile/", "", Strings::normaliseLink($profiledata["url"]));
+ 	if (strstr(Strings::normaliseLink($profiledata['url']), Strings::normaliseLink(DI::baseUrl()))) {
+ 		$nickname = str_replace(Strings::normaliseLink(DI::baseUrl()) . '/profile/', '', Strings::normaliseLink($profiledata['url']));
  
- 		if ($nickname != $a->user["nickname"]) {
+ 		if (!empty($a->user['nickname']) && $nickname != $a->user['nickname']) {
  			$profile = DBA::fetchFirst("SELECT `profile`.* , `contact`.`avatar-date` AS picdate, `user`.* FROM `profile`
  				INNER JOIN `contact` on `contact`.`uid` = `profile`.`uid` INNER JOIN `user` ON `profile`.`uid` = `user`.`uid`
 -				WHERE `user`.`nickname` = ? AND `profile`.`is-default` AND `contact`.`self` LIMIT 1",
 +				WHERE `user`.`nickname` = ? AND `contact`.`self` LIMIT 1",
  				$nickname
  			);
  			if (DBA::isResult($profile)) {