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

Fix several notices

Browse source
This commit is contained in:
Michael 2020-12-29 21:38:23 +00:00
parent cf65725373
commit a294c19d6e
3 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
mod/cal.php
View file

@ -24,7 +24,6 @@
*/ */
use Friendica\App; use Friendica\App;
use Friendica\Content\Feature;
use Friendica\Content\Nav; use Friendica\Content\Nav;
use Friendica\Content\Text\BBCode; use Friendica\Content\Text\BBCode;
use Friendica\Content\Widget; use Friendica\Content\Widget;
@ -69,7 +68,6 @@ function cal_init(App $a)
} }
$a->profile = Profile::getByNickname($nick, $a->profile_uid); $a->profile = Profile::getByNickname($nick, $a->profile_uid);
if (empty($a->profile)) { if (empty($a->profile)) {
throw new HTTPException\NotFoundException(DI::l10n()->t('User not found.')); throw new HTTPException\NotFoundException(DI::l10n()->t('User not found.'));
} }
@ -131,6 +129,9 @@ function cal_content(App $a)
// Setup permissions structures // Setup permissions structures
$owner_uid = intval($a->data['user']['uid']); $owner_uid = intval($a->data['user']['uid']);
$nick = $a->data['user']['nickname']; $nick = $a->data['user']['nickname'];
if (empty($a->profile)) {
throw new HTTPException\NotFoundException(DI::l10n()->t('User not found.'));
}
$contact_id = Session::getRemoteContactID($a->profile['uid']); $contact_id = Session::getRemoteContactID($a->profile['uid']);

2
mod/message.php
View file

@ -332,7 +332,7 @@ function message_content(App $a)
'id' => $message['id'], 'id' => $message['id'],
'from_name' => $from_name_e, 'from_name' => $from_name_e,
'from_url' => $from_url, 'from_url' => $from_url,
'from_addr' => $contact['addr'], 'from_addr' => $contact['addr'] ?? $from_url,
'sparkle' => $sparkle, 'sparkle' => $sparkle,
'from_photo' => $from_photo, 'from_photo' => $from_photo,
'subject' => $subject_e, 'subject' => $subject_e,

3
src/Model/Event.php
View file

@ -291,6 +291,9 @@ class Event
} }
$contact = DBA::selectFirst('contact', [], $conditions); $contact = DBA::selectFirst('contact', [], $conditions);
if (!DBA::isResult($contact)) {
Logger::warning('Contact not found', ['condition' => $conditions]);
}
// Existing event being modified. // Existing event being modified.
if ($event['id']) { if ($event['id']) {