kill the ummagumma effect

This commit is contained in:
friendica 2014-01-16 13:26:39 -08:00
parent be6a16139c
commit 359d798029
2 changed files with 5 additions and 3 deletions

View File

@ -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(

View File

@ -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);