]> git.mxchange.org Git - friendica.git/commitdiff
Check for $a->user["nickname"] existence before retrieving its value in mod/display
authorHypolite Petovan <hypolite@mrpetovan.com>
Sun, 26 Jan 2020 21:44:02 +0000 (16:44 -0500)
committerHypolite Petovan <hypolite@mrpetovan.com>
Sun, 26 Jan 2020 21:44:02 +0000 (16:44 -0500)
- Addresses part of https://github.com/friendica/friendica/issues/8000#issuecomment-573883153

mod/display.php

index b5edafc5f93f84db4a20fa61125df4853ab229b3..f9c7f9dcf79007d1fddedbcdfad23342b743eaa9 100644 (file)
@@ -97,9 +97,9 @@ 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"]));
+               $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",