frio - fix PHP Notices reported in #6338
This commit is contained in:
parent
cd19cce92e
commit
eee0e22856
1 changed files with 3 additions and 3 deletions
|
@ -237,25 +237,25 @@ function frio_remote_nav($a, &$nav)
|
||||||
} elseif (!local_user() && remote_user()) {
|
} elseif (!local_user() && remote_user()) {
|
||||||
$r = q("SELECT `name`, `nick`, `micro` AS `photo` FROM `contact` WHERE `id` = %d", intval(remote_user()));
|
$r = q("SELECT `name`, `nick`, `micro` AS `photo` FROM `contact` WHERE `id` = %d", intval(remote_user()));
|
||||||
$nav['remote'] = L10n::t('Guest');
|
$nav['remote'] = L10n::t('Guest');
|
||||||
$remoteUser = $r[0];
|
|
||||||
} elseif (Model\Profile::getMyURL()) {
|
} elseif (Model\Profile::getMyURL()) {
|
||||||
$r = q("SELECT `name`, `nick`, `photo` FROM `gcontact`
|
$r = q("SELECT `name`, `nick`, `photo` FROM `gcontact`
|
||||||
WHERE `addr` = '%s' AND `network` = 'dfrn'",
|
WHERE `addr` = '%s' AND `network` = 'dfrn'",
|
||||||
DBA::escape($webbie));
|
DBA::escape($webbie));
|
||||||
$nav['remote'] = L10n::t('Visitor');
|
$nav['remote'] = L10n::t('Visitor');
|
||||||
$remoteUser = $r[0];
|
|
||||||
} else {
|
} else {
|
||||||
$r = false;
|
$r = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$remoteUser = null;
|
||||||
if (DBA::isResult($r)) {
|
if (DBA::isResult($r)) {
|
||||||
$nav['userinfo'] = [
|
$nav['userinfo'] = [
|
||||||
'icon' => (DBA::isResult($r) ? $r[0]['photo'] : 'images/person-48.jpg'),
|
'icon' => (DBA::isResult($r) ? $r[0]['photo'] : 'images/person-48.jpg'),
|
||||||
'name' => $r[0]['name'],
|
'name' => $r[0]['name'],
|
||||||
];
|
];
|
||||||
|
$remoteUser = $r[0];
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!local_user() && !empty($server_url)) {
|
if (!local_user() && !empty($server_url) && !is_null($remoteUser)) {
|
||||||
$nav['logout'] = [$server_url . '/logout', L10n::t('Logout'), '', L10n::t('End this session')];
|
$nav['logout'] = [$server_url . '/logout', L10n::t('Logout'), '', L10n::t('End this session')];
|
||||||
|
|
||||||
// user menu
|
// user menu
|
||||||
|
|
Loading…
Reference in a new issue