aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-01-19 22:34:28 -0800
committerfriendica <info@friendica.com>2014-01-19 22:34:28 -0800
commit0250223438d38a508b991a581ef08de904ac6368 (patch)
tree7e6bbc7142035471e8c674d1c3a3468d2f77f84d /include
parente54a5010588e58f4fa1b348b7e46a34360c6bce2 (diff)
downloadvolse-hubzilla-0250223438d38a508b991a581ef08de904ac6368.tar.gz
volse-hubzilla-0250223438d38a508b991a581ef08de904ac6368.tar.bz2
volse-hubzilla-0250223438d38a508b991a581ef08de904ac6368.zip
revert 26dfcecf054e1
Diffstat (limited to 'include')
-rw-r--r--include/reddav.php8
1 files changed, 2 insertions, 6 deletions
diff --git a/include/reddav.php b/include/reddav.php
index 0d2aac19e..a937360a8 100644
--- a/include/reddav.php
+++ b/include/reddav.php
@@ -50,10 +50,6 @@ class RedDirectory extends DAV\Node implements DAV\ICollection {
function getChild($name) {
logger('RedDirectory::getChild : ' . $name, LOGGER_DATA);
- $name = str_replace(array('?f=','&f='),array('',''),$name);
- $name = preg_replace('/[\?&]zid=(.*?)([\?&]|$)/ism','',$name);
- logger('RedDirectory::getChild post strip zid: ' . $name, LOGGER_DATA);
-
if(get_config('system','block_public') && (! $this->auth->channel_id) && (! $this->auth->observer)) {
throw new DAV\Exception\Forbidden('Permission denied.');
@@ -193,8 +189,8 @@ class RedDirectory extends DAV\Node implements DAV\ICollection {
}
$r = q("select * from channel where channel_id = %d and not (channel_pageflags & %d) limit 1",
- intval(PAGE_REMOVED),
- intval($this->auth->owner_id)
+ intval($this->auth->owner_id),
+ intval(PAGE_REMOVED)
);
if($r) {