From adbcf371f9c282db4d0a1c936d8866f24c060e5c Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 10 Jun 2014 16:40:55 -0700 Subject: should really wait until after the first cuppa --- include/apps.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'include') diff --git a/include/apps.php b/include/apps.php index 40fa42576..31f93e25a 100644 --- a/include/apps.php +++ b/include/apps.php @@ -208,9 +208,10 @@ function app_render($papp,$mode = 'view') { $hosturl = z_root() . '/'; } elseif(remote_user()) { - $channel = get_app()->get_channel(); - if($channel) { - $x = parse_url($channel['xchan_connurl']); + $observer = get_app()->get_get_observer(); + if($observer && $observer['xchan_network'] === 'zot') { + // some folks might have xchan_url redirected offsite, use the connurl + $x = parse_url($observer['xchan_connurl']); if($x) { $hosturl = $x['scheme'] . '://' . $x['host'] . '/'; } @@ -223,7 +224,7 @@ function app_render($papp,$mode = 'view') { '$app' => $papp, '$hosturl' => $hosturl, '$purchase' => (($papp['page'] && (! $installed)) ? t('Purchase') : ''), - '$install' => (((local_user() || $hosturl) && $mode == 'view') ? $install_action : ''), + '$install' => (($hosturl && $mode == 'view') ? $install_action : ''), '$edit' => ((local_user() && $installed && $mode == 'edit') ? t('Edit') : ''), '$delete' => ((local_user() && $installed && $mode == 'edit') ? t('Delete') : '') )); -- cgit v1.2.3