Merge remote-tracking branch 'upstream/2018.08-rc' into ap1

This commit is contained in:
Michael 2018-09-15 20:49:46 +00:00
commit e45206ae5d
17 changed files with 81 additions and 58 deletions

View file

@ -361,7 +361,7 @@ class Profile
if ($r) {
$remote_url = $r[0]['url'];
$message_path = preg_replace('=(.*)/profile/(.*)=ism', '$1/message/new/', $remote_url);
$wallmessage_link = $message_path . base64_encode($profile['addr']);
$wallmessage_link = $message_path . base64_encode(defaults($profile, 'addr', ''));
} else if (!empty($profile['nickname'])) {
$wallmessage_link = 'wallmessage/' . $profile['nickname'];
}