clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #6332 from annando/assign-uid 

Only assign a uid to the profile if not defined by now
This commit is contained in:
Hypolite Petovan 2018-12-27 09:28:22 -05:00 committed by GitHub
parent 86f4cc90a2 826965f6df
commit c07fa5d069
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mod/display.php
View File

@ -291,8 +291,8 @@ function display_content(App $a, $update = false, $update_uid = 0)
$parent = Item::selectFirst(['uid'], ['uri' => $item_parent_uri, 'wall' => true]); $parent = Item::selectFirst(['uid'], ['uri' => $item_parent_uri, 'wall' => true]);
if (DBA::isResult($parent)) { if (DBA::isResult($parent)) {
$a->profile['uid'] = $parent['uid']; $a->profile['uid'] = defaults($a->profile, 'uid', $parent['uid']);
$a->profile['profile_uid'] = $parent['uid']; $a->profile['profile_uid'] = defaults($a->profile, 'profile_uid', $parent['uid']);
$is_remote_contact = Contact::isFollower(remote_user(), $a->profile['profile_uid']); $is_remote_contact = Contact::isFollower(remote_user(), $a->profile['profile_uid']);
} }