diff options
| author | friendica <info@friendica.com> | 2014-01-19 22:28:46 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-01-19 22:28:46 -0800 |
| commit | e54a5010588e58f4fa1b348b7e46a34360c6bce2 (patch) | |
| tree | 3cb98a3bd11628e58eb77c455c1df6ef542cb287 | |
| parent | 82a5eb5d90d99cfd9fc3a319235c2f24cff2de67 (diff) | |
| parent | 26dfcecf054e19616f198872b66c7645270f4430 (diff) | |
| download | volse-hubzilla-e54a5010588e58f4fa1b348b7e46a34360c6bce2.tar.gz volse-hubzilla-e54a5010588e58f4fa1b348b7e46a34360c6bce2.tar.bz2 volse-hubzilla-e54a5010588e58f4fa1b348b7e46a34360c6bce2.zip | |
Merge https://github.com/friendica/red into zpull
| -rw-r--r-- | include/reddav.php | 3 | ||||
| -rw-r--r-- | mod/search.php | 7 |
2 files changed, 7 insertions, 3 deletions
diff --git a/include/reddav.php b/include/reddav.php index 838ead7b7..0d2aac19e 100644 --- a/include/reddav.php +++ b/include/reddav.php @@ -50,6 +50,9 @@ 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)) { diff --git a/mod/search.php b/mod/search.php index d13c613c2..22e521164 100644 --- a/mod/search.php +++ b/mod/search.php @@ -8,11 +8,12 @@ function search_init(&$a) { function search_content(&$a,$update = 0, $load = false) { - if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) { - notice( t('Public access denied.') . EOL); + if((get_config('system','block_public')) || (get_config('system','block_public_search'))) { + if ((! local_user()) && (! remote_user())) { + notice( t('Public access denied.') . EOL); return; + } } - nav_set_selected('search'); require_once("include/bbcode.php"); |