Merge pull request #3614 from annando/avoid-warnings
Avoid some PHP warnings, no functional changes
This commit is contained in:
commit
b7fb43484e
|
@ -161,7 +161,7 @@ class dba {
|
|||
public function log_index($query) {
|
||||
$a = get_app();
|
||||
|
||||
if ($a->config["system"]["db_log_index"] == "") {
|
||||
if (empty($a->config["system"]["db_log_index"])) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
|
@ -929,8 +929,8 @@ function zrl($s, $force = false) {
|
|||
* is set to true
|
||||
*/
|
||||
function get_theme_uid() {
|
||||
$uid = (($_REQUEST['puid']) ? intval($_REQUEST['puid']) : 0);
|
||||
if ((local_user()) && ((get_pconfig(local_user(),'system','always_my_theme')) || (! $uid))) {
|
||||
$uid = ((!empty($_REQUEST['puid'])) ? intval($_REQUEST['puid']) : 0);
|
||||
if ((local_user()) && ((get_pconfig(local_user(), 'system', 'always_my_theme')) || (! $uid))) {
|
||||
return local_user();
|
||||
}
|
||||
|
||||
|
|
|
@ -562,7 +562,7 @@ function theme_include($file, $root = '') {
|
|||
if ($root !== '' && $root[strlen($root)-1] !== '/') {
|
||||
$root = $root . '/';
|
||||
}
|
||||
$theme_info = $a->theme_info;
|
||||
$theme_info = get_app()->theme_info;
|
||||
if (is_array($theme_info) && array_key_exists('extends',$theme_info)) {
|
||||
$parent = $theme_info['extends'];
|
||||
} else {
|
||||
|
|
|
@ -9,7 +9,9 @@
|
|||
require_once('view/theme/frio/php/frio_boot.php');
|
||||
|
||||
// $minimal = is_modal();
|
||||
|
||||
if (!isset($minimal)) {
|
||||
$minimal = false;
|
||||
}
|
||||
?>
|
||||
<html>
|
||||
<head>
|
||||
|
|
|
@ -216,7 +216,7 @@ function frio_remote_nav($a,&$nav) {
|
|||
|
||||
// since $userinfo isn't available for the hook we write it to the nav array
|
||||
// this isn't optimal because the contact query will be done now twice
|
||||
if(local_user()) {
|
||||
if (local_user()) {
|
||||
// empty the server url for local user because we won't need it
|
||||
$server_url = '';
|
||||
// user info
|
||||
|
@ -225,25 +225,27 @@ function frio_remote_nav($a,&$nav) {
|
|||
$r[0]['photo'] = (dbm::is_result($r) ? $a->remove_baseurl($r[0]['micro']) : "images/person-48.jpg");
|
||||
$r[0]['name'] = $a->user['username'];
|
||||
|
||||
} 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()));
|
||||
$nav['remote'] = t("Guest");
|
||||
|
||||
} elseif(get_my_url ()) {
|
||||
} elseif (get_my_url()) {
|
||||
$r = q("SELECT `name`, `nick`, `photo` FROM `gcontact`
|
||||
WHERE `addr` = '%s' AND `network` = 'dfrn'",
|
||||
dbesc($webbie));
|
||||
$nav['remote'] = t("Visitor");
|
||||
} else {
|
||||
$r = false;
|
||||
}
|
||||
|
||||
if (dbm::is_result($r)){
|
||||
if (dbm::is_result($r)) {
|
||||
$nav['userinfo'] = array(
|
||||
'icon' => (dbm::is_result($r) ? $r[0]['photo'] : "images/person-48.jpg"),
|
||||
'name' => $r[0]['name'],
|
||||
);
|
||||
}
|
||||
|
||||
if(!local_user() && !empty($server_url)) {
|
||||
if (!local_user() && !empty($server_url)) {
|
||||
$nav['logout'] = Array($server_url . '/logout', t('Logout'), "", t('End this session'));
|
||||
|
||||
// user menu
|
||||
|
|
Loading…
Reference in New Issue
Block a user