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

Remove direct calls to App->user

Browse Source
This commit is contained in:
Michael
2021-08-08 10:14:56 +00:00
parent 266ee26240
commit fc283ab928
51 changed files with 238 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Model/Mail.php
View File

@@ -173,7 +173,7 @@ class Mail
$recip_host = substr($recip_host, 0, strpos($recip_host, '/'));
$recip_handle = (($contact['addr']) ? $contact['addr'] : $contact['nick'] . '@' . $recip_host);
$sender_handle = $a->user['nickname'] . '@' . substr(DI::baseUrl(), strpos(DI::baseUrl(), '://') + 3);
$sender_handle = $a->getNickname() . '@' . substr(DI::baseUrl(), strpos(DI::baseUrl(), '://') + 3);
$conv_guid = System::createUUID();
$convuri = $recip_handle . ':' . $conv_guid;

2
src/Model/User.php
View File

@@ -155,6 +155,8 @@ class User
$system['region'] = '';
$system['country-name'] = '';
$system['net-publish'] = false;
$system['picdate'] = '';
$system['theme'] = '';
// Ensure that the user contains data
$user = DBA::selectFirst('user', ['prvkey', 'guid'], ['uid' => 0]);