keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #9468 from annando/notices

Browse source 
Fix notice "Undefined index: network" and warning "strpos(): Empty needle"
This commit is contained in:
Hypolite Petovan 2020-10-29 11:44:40 -04:00 committed by GitHub
commit 0ab4723367
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Content/PageInfo.php
View file

@ -292,7 +292,7 @@ class PageInfo
$quotedUrl $quotedUrl
)$#isx", function ($match) use ($url) { )$#isx", function ($match) use ($url) {
// Stripping URLs with no label // Stripping URLs with no label
if (!isset($match[1])) { if (empty($match[1])) {
return ''; return '';
} }

2
src/Module/Contact.php
View file

@ -937,7 +937,7 @@ class Contact extends BaseModule
], ],
]; ];
if (in_array($contact['network'], [Protocol::FEED, Protocol::MAIL]) && ($cid != $pcid)) { if (!empty($contact['network']) && in_array($contact['network'], [Protocol::FEED, Protocol::MAIL]) && ($cid != $pcid)) {
$tabs[] = ['label' => DI::l10n()->t('Advanced'), $tabs[] = ['label' => DI::l10n()->t('Advanced'),
'url' => 'contact/' . $cid . '/advanced/', 'url' => 'contact/' . $cid . '/advanced/',
'sel' => (($active_tab == self::TAB_ADVANCED) ? 'active' : ''), 'sel' => (($active_tab == self::TAB_ADVANCED) ? 'active' : ''),