strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #5936 from MrPetovan/bug/5932-fix-notices

Browse source 
Fix PHP notices S02E01
This commit is contained in:
Michael Vogel 2018-10-16 08:42:25 +02:00 committed by GitHub
parent c4cb396730 481b0ac138
commit 24a4eb9699
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
include/enotify.php
View file

@ -42,9 +42,9 @@ function notification($params)
} }
$params['notify_flags'] = defaults($params, 'notify_flags', $user['notify-flags']); $params['notify_flags'] = defaults($params, 'notify_flags', $user['notify-flags']);
$params['language'] = defaults($params, 'language', $user['language']); $params['language'] = defaults($params, 'language' , $user['language']);
$params['to_name'] = defaults($params, 'to_name', $user['username']); $params['to_name'] = defaults($params, 'to_name' , $user['username']);
$params['to_email'] = defaults($params, 'to_email', $user['email']); $params['to_email'] = defaults($params, 'to_email' , $user['email']);
// from here on everything is in the recipients language // from here on everything is in the recipients language
L10n::pushLang($params['language']); L10n::pushLang($params['language']);

5
src/Database/DBStructure.php
View file

@ -83,10 +83,11 @@ class DBStructure
$body = sprintf($body, $error_message); $body = sprintf($body, $error_message);
notification([ notification([
'type' => SYSTEM_EMAIL, 'uid' => $admin['uid'],
'type' => SYSTEM_EMAIL,
'to_email' => $admin['email'], 'to_email' => $admin['email'],
'preamble' => $preamble, 'preamble' => $preamble,
'body' => $body, 'body' => $body,
'language' => $lang] 'language' => $lang]
); );
} }

14
src/Network/Probe.php
View file

@ -953,13 +953,13 @@ class Probe
$prof_data["addr"] = $data["addr"]; $prof_data["addr"] = $data["addr"];
$prof_data["nick"] = $data["nick"]; $prof_data["nick"] = $data["nick"];
$prof_data["dfrn-request"] = $data["request"]; $prof_data["dfrn-request"] = defaults($data, 'request', null);
$prof_data["dfrn-confirm"] = $data["confirm"]; $prof_data["dfrn-confirm"] = defaults($data, 'confirm', null);
$prof_data["dfrn-notify"] = $data["notify"]; $prof_data["dfrn-notify"] = defaults($data, 'notify' , null);
$prof_data["dfrn-poll"] = $data["poll"]; $prof_data["dfrn-poll"] = defaults($data, 'poll' , null);
$prof_data["photo"] = $data["photo"]; $prof_data["photo"] = defaults($data, 'photo' , null);
$prof_data["fn"] = $data["name"]; $prof_data["fn"] = defaults($data, 'name' , null);
$prof_data["key"] = $data["pubkey"]; $prof_data["key"] = defaults($data, 'pubkey' , null);
logger("Result for profile ".$profile_link.": ".print_r($prof_data, true), LOGGER_DEBUG); logger("Result for profile ".$profile_link.": ".print_r($prof_data, true), LOGGER_DEBUG);