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

Merge pull request #10661 from MrPetovan/bug/fatal-errors 

Check for user array key before using it in include/conversation
This commit is contained in:
Michael Vogel 2021-09-03 19:43:29 +02:00 committed by GitHub
parent dc78686281 3e677414d5
commit 14050ea67b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/conversation.php
View File

@ -1068,11 +1068,14 @@ function format_activity(array $links, $verb, $id) {
function status_editor(App $a, array $x = [], $notes_cid = 0, $popup = false) function status_editor(App $a, array $x = [], $notes_cid = 0, $popup = false)
{ {
$user = User::getById($a->getLoggedInUserId(), ['uid', 'nickname', 'allow_location', 'default-location']);
if (empty($user['uid'])) {
return '';
}
DI::profiler()->startRecording('rendering'); DI::profiler()->startRecording('rendering');
$o = ''; $o = '';
$user = User::getById($a->getLoggedInUserId(), ['uid', 'nickname', 'allow_location', 'default-location']);
$x['allow_location'] = $x['allow_location'] ?? $user['allow_location']; $x['allow_location'] = $x['allow_location'] ?? $user['allow_location'];
$x['default_location'] = $x['default_location'] ?? $user['default-location']; $x['default_location'] = $x['default_location'] ?? $user['default-location'];
$x['nickname'] = $x['nickname'] ?? $user['nickname']; $x['nickname'] = $x['nickname'] ?? $user['nickname'];