diff options
| author | friendica <info@friendica.com> | 2014-05-29 16:14:10 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-05-29 16:14:10 -0700 |
| commit | 9b5eabf1083602382385c62c6ad7d8ae8e167f9e (patch) | |
| tree | a73ed07970a517dbad90f14954fea790193813c3 /mod/chanview.php | |
| parent | a00103b7dfa0b128cbe6ab03e6a43ccedb24f8c2 (diff) | |
| parent | 1a58777daa0ab9394f38737a806a7a185ebceeb0 (diff) | |
| download | volse-hubzilla-9b5eabf1083602382385c62c6ad7d8ae8e167f9e.tar.gz volse-hubzilla-9b5eabf1083602382385c62c6ad7d8ae8e167f9e.tar.bz2 volse-hubzilla-9b5eabf1083602382385c62c6ad7d8ae8e167f9e.zip | |
Merge branch 'master' into newevent
Conflicts:
include/zot.php
Diffstat (limited to 'mod/chanview.php')
| -rw-r--r-- | mod/chanview.php | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/mod/chanview.php b/mod/chanview.php index ca3410c8f..449a98bb1 100644 --- a/mod/chanview.php +++ b/mod/chanview.php @@ -84,15 +84,17 @@ function chanview_content(&$a) { $url = zid($url); // let somebody over-ride the iframed viewport presentation + // or let's just declare this a failed experiment. - if((! local_user()) || (get_pconfig(local_user(),'system','chanview_full'))) - goaway($url); +// if((! local_user()) || (get_pconfig(local_user(),'system','chanview_full'))) + + goaway($url); - $o = replace_macros(get_markup_template('chanview.tpl'),array( - '$url' => $url, - '$full' => t('toggle full screen mode') - )); +// $o = replace_macros(get_markup_template('chanview.tpl'),array( +// '$url' => $url, +// '$full' => t('toggle full screen mode') +// )); - return $o; +// return $o; }
\ No newline at end of file |