when it's a contentious issue, make it an option.

This commit is contained in:
friendica 2013-09-20 18:24:11 -07:00
parent fb03195c3f
commit 7585b58d28

View File

@ -79,15 +79,19 @@ function chanview_content(&$a) {
return; return;
} }
if($xchan['xchan_hash'])
$a->set_widget('vcard',vcard_from_xchan($xchan,$observer,'chanview'));
$url = (($observer) $url = (($observer)
? z_root() . '/magic?f=&dest=' . $xchan['xchan_url'] . '&addr=' . $xchan['xchan_addr'] ? z_root() . '/magic?f=&dest=' . $xchan['xchan_url'] . '&addr=' . $xchan['xchan_addr']
: $xchan['xchan_url'] : $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( $o = replace_macros(get_markup_template('chanview.tpl'),array(
'$url' => $url, '$url' => $url,