Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-26 09:10:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #5563 from MrPetovan/bug/5470-fix-various-notices

Browse source 
Fix various notices
This commit is contained in:
Michael Vogel 2018-08-07 21:34:47 +02:00 • committed by GitHub
commit eaf81e5e66
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 37 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/Model/Profile.php
View file

@ -336,9 +336,11 @@ class Profile
$subscribe_feed = false;
}
$wallmessage = false;
$wallmessage_link = false;
if (remote_user() || (self::getMyURL() && x($profile, 'unkmail') && ($profile['uid'] != local_user()))) {
$wallmessage = L10n::t('Message');
$wallmessage_link = 'wallmessage/' . $profile['nickname'];
if (remote_user()) {
$r = q(
@ -359,10 +361,9 @@ class Profile
$remote_url = $r[0]['url'];
$message_path = preg_replace('=(.*)/profile/(.*)=ism', '$1/message/new/', $remote_url);
$wallmessage_link = $message_path . base64_encode($profile['addr']);
} else if (!empty($profile['nickname'])) {
$wallmessage_link = 'wallmessage/' . $profile['nickname'];
}
} else {
$wallmessage = false;
$wallmessage_link = false;
}
// show edit profile to yourself