Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-12-23 11:20:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #9233 from annando/notice

Browse source 
Fixes several notices
This commit is contained in:
Tobias Diekershoff 2020-09-19 08:07:16 +02:00 committed by GitHub
commit 5eb44ca36b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
mod/events.php
View file

@ -474,16 +474,16 @@ function events_content(App $a)
$t_orig = $orig_event['summary'] ?? ''; $t_orig = $orig_event['summary'] ?? '';
$d_orig = $orig_event['desc'] ?? ''; $d_orig = $orig_event['desc'] ?? '';
$l_orig = $orig_event['location'] ?? ''; $l_orig = $orig_event['location'] ?? '';
$eid = !empty($orig_event) ? $orig_event['id'] : 0; $eid = $orig_event['id'] ?? 0;
$cid = !empty($orig_event) ? $orig_event['cid'] : 0; $cid = $orig_event['cid'] ?? 0;
$uri = !empty($orig_event) ? $orig_event['uri'] : ''; $uri = $orig_event['uri'] ?? '';
if ($cid || $mode === 'edit') { if ($cid || $mode === 'edit') {
$share_disabled = 'disabled="disabled"'; $share_disabled = 'disabled="disabled"';
} }
$sdt = !empty($orig_event) ? $orig_event['start'] : 'now'; $sdt = $orig_event['start'] ?? 'now';
$fdt = !empty($orig_event) ? $orig_event['finish'] : 'now'; $fdt = $orig_event['finish'] ?? 'now';
$tz = date_default_timezone_get(); $tz = date_default_timezone_get();
if (!empty($orig_event)) { if (!empty($orig_event)) {

2
src/Model/Contact.php
View file

@ -1909,7 +1909,7 @@ class Contact
$ret['pubkey'] = $new_pubkey; $ret['pubkey'] = $new_pubkey;
} }
if (($ret['addr'] != $contact['addr']) || (!empty($ret['alias']) && ($ret['alias'] != $contact['alias']))) { if ((!empty($ret['addr']) && ($ret['addr'] != $contact['addr'])) || (!empty($ret['alias']) && ($ret['alias'] != $contact['alias']))) {
$ret['uri-date'] = DateTimeFormat::utcNow(); $ret['uri-date'] = DateTimeFormat::utcNow();
} }

7
src/Model/Mail.php
View file

@ -129,9 +129,12 @@ class Mail
} }
$me = DBA::selectFirst('contact', [], ['uid' => local_user(), 'self' => true]); $me = DBA::selectFirst('contact', [], ['uid' => local_user(), 'self' => true]);
$contact = DBA::selectFirst('contact', [], ['id' => $recipient, 'uid' => local_user()]); if (!DBA::isResult($me)) {
return -2;
}
if (!(count($me) && (count($contact)))) { $contact = DBA::selectFirst('contact', [], ['id' => $recipient, 'uid' => local_user()]);
if (!DBA::isResult($contact)) {
return -2; return -2;
} }

2
view/theme/frio/php/default.php
View file

@ -125,7 +125,7 @@ $is_singleuser_class = $is_singleuser ? "is-singleuser" : "is-not-singleuser";
<div class="col-lg-7 col-md-7 col-sm-12 col-xs-12" id="content"> <div class="col-lg-7 col-md-7 col-sm-12 col-xs-12" id="content">
<section class="sectiontop '; <section class="sectiontop ';
echo $a->argv[0]; echo $a->argv[0] ?? '';
echo '-content-wrapper">'; echo '-content-wrapper">';
if (!empty($page['content'])) { if (!empty($page['content'])) {
echo $page['content']; echo $page['content'];