diff --git a/include/dba.php b/include/dba.php index 08b6e0ad8..d921167c1 100644 --- a/include/dba.php +++ b/include/dba.php @@ -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; } diff --git a/include/identity.php b/include/identity.php index 5de5c919d..b24a5314a 100644 --- a/include/identity.php +++ b/include/identity.php @@ -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(); } diff --git a/include/plugin.php b/include/plugin.php index 0c43b4d44..f5f0bb2b2 100644 --- a/include/plugin.php +++ b/include/plugin.php @@ -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 { diff --git a/view/theme/frio/php/default.php b/view/theme/frio/php/default.php index ef7e413ad..6d2e78656 100644 --- a/view/theme/frio/php/default.php +++ b/view/theme/frio/php/default.php @@ -9,7 +9,9 @@ require_once('view/theme/frio/php/frio_boot.php'); // $minimal = is_modal(); - + if (!isset($minimal)) { + $minimal = false; + } ?> diff --git a/view/theme/frio/theme.php b/view/theme/frio/theme.php index 551f39c8f..36f229263 100644 --- a/view/theme/frio/theme.php +++ b/view/theme/frio/theme.php @@ -214,7 +214,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 @@ -223,25 +223,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