From 359d7980292490da370e49b5f3583d801157b5b7 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 16 Jan 2014 13:26:39 -0800 Subject: kill the ummagumma effect --- mod/chanview.php | 2 +- mod/cloud.php | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'mod') diff --git a/mod/chanview.php b/mod/chanview.php index c4942b938..ae22212b9 100644 --- a/mod/chanview.php +++ b/mod/chanview.php @@ -89,7 +89,7 @@ function chanview_content(&$a) { // let somebody over-ride the iframed viewport presentation - if(local_user() && get_pconfig(local_user(),'system','chanview_full')) + if((! local_user()) || (get_pconfig(local_user(),'system','chanview_full'))) goaway($url); $o = replace_macros(get_markup_template('chanview.tpl'),array( diff --git a/mod/cloud.php b/mod/cloud.php index 82b570380..2db7682ef 100644 --- a/mod/cloud.php +++ b/mod/cloud.php @@ -65,6 +65,10 @@ function cloud_init(&$a) { } + $_SERVER['QUERY_STRING'] = str_replace(array('?f=','&f='),array('',''),$_SERVER['QUERY_STRING']); + $_SERVER['QUERY_STRING'] = preg_replace('/[\?&]zid=(.*?)([\?&]|$)/ism','',$_SERVER['QUERY_STRING']); + + $rootDirectory = new RedDirectory('/',$auth); $server = new DAV\Server($rootDirectory); $lockBackend = new DAV\Locks\Backend\File('store/data/locks'); @@ -82,8 +86,6 @@ function cloud_init(&$a) { $auth->setBrowserPlugin($browser); - $_SERVER['QUERY_STRING'] = str_replace(array('?f=','&f='),array('',''),$_SERVER['QUERY_STRING']); - $_SERVER['QUERY_STRING'] = preg_replace('/[\?&]zid=(.*?)([\?&]|$)/ism','',$_SERVER['QUERY_STRING']); $server->addPlugin($browser); -- cgit v1.2.3