Browse Source

Merge pull request #9233 from annando/notice

Fixes several notices
tags/2020.09
Tobias Diekershoff 1 month ago
committed by GitHub
parent
commit
5eb44ca36b
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 9 deletions
  1. +5
    -5
      mod/events.php
  2. +1
    -1
      src/Model/Contact.php
  3. +5
    -2
      src/Model/Mail.php
  4. +1
    -1
      view/theme/frio/php/default.php

+ 5
- 5
mod/events.php View File

@@ -474,16 +474,16 @@ function events_content(App $a)
$t_orig = $orig_event['summary'] ?? '';
$d_orig = $orig_event['desc'] ?? '';
$l_orig = $orig_event['location'] ?? '';
$eid = !empty($orig_event) ? $orig_event['id'] : 0;
$cid = !empty($orig_event) ? $orig_event['cid'] : 0;
$uri = !empty($orig_event) ? $orig_event['uri'] : '';
$eid = $orig_event['id'] ?? 0;
$cid = $orig_event['cid'] ?? 0;
$uri = $orig_event['uri'] ?? '';

if ($cid || $mode === 'edit') {
$share_disabled = 'disabled="disabled"';
}

$sdt = !empty($orig_event) ? $orig_event['start'] : 'now';
$fdt = !empty($orig_event) ? $orig_event['finish'] : 'now';
$sdt = $orig_event['start'] ?? 'now';
$fdt = $orig_event['finish'] ?? 'now';

$tz = date_default_timezone_get();
if (!empty($orig_event)) {


+ 1
- 1
src/Model/Contact.php View File

@@ -1909,7 +1909,7 @@ class Contact
$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();
}



+ 5
- 2
src/Model/Mail.php View File

@@ -129,9 +129,12 @@ class Mail
}

$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;
}



+ 1
- 1
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">
<section class="sectiontop ';
echo $a->argv[0];
echo $a->argv[0] ?? '';
echo '-content-wrapper">';
if (!empty($page['content'])) {
echo $page['content'];


Loading…
Cancel
Save