aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-09-20 18:24:11 -0700
committerfriendica <info@friendica.com>2013-09-20 18:24:11 -0700
commit7585b58d28978837a89f3a541c8b508dd04a92bc (patch)
tree1d1a296775a506ea10624d397241e7567fa406ad
parentfb03195c3f0dd461a0e8b809814f3cfbef515980 (diff)
downloadvolse-hubzilla-7585b58d28978837a89f3a541c8b508dd04a92bc.tar.gz
volse-hubzilla-7585b58d28978837a89f3a541c8b508dd04a92bc.tar.bz2
volse-hubzilla-7585b58d28978837a89f3a541c8b508dd04a92bc.zip
when it's a contentious issue, make it an option.
-rw-r--r--mod/chanview.php12
1 files changed, 8 insertions, 4 deletions
diff --git a/mod/chanview.php b/mod/chanview.php
index 4f7638846..f183fbdf1 100644
--- a/mod/chanview.php
+++ b/mod/chanview.php
@@ -79,16 +79,20 @@ function chanview_content(&$a) {
return;
}
- if($xchan['xchan_hash'])
- $a->set_widget('vcard',vcard_from_xchan($xchan,$observer,'chanview'));
-
$url = (($observer)
? z_root() . '/magic?f=&dest=' . $xchan['xchan_url'] . '&addr=' . $xchan['xchan_addr']
: $xchan['xchan_url']
);
-
+ // let somebody over-ride the iframed viewport presentation
+
+ if(local_user() && get_pconfig(local_user(),'system','chanview_full'))
+ goaway($url);
+
+ if($xchan['xchan_hash'])
+ $a->set_widget('vcard',vcard_from_xchan($xchan,$observer,'chanview'));
+
$o = replace_macros(get_markup_template('chanview.tpl'),array(
'$url' => $url,
'$full' => t('toggle full screen mode')