Merge pull request #8179 from MrPetovan/bug/notices
authorPhilipp <admin+Github@philipp.info>
Sun, 26 Jan 2020 22:10:56 +0000 (23:10 +0100)
committerGitHub <noreply@github.com>
Sun, 26 Jan 2020 22:10:56 +0000 (23:10 +0100)
Various notice fixes

1  2 
include/api.php
mod/display.php

diff --cc include/api.php
Simple merge
diff --cc 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)) {