harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge https://github.com/friendica/red into zpull

Browse Source
This commit is contained in:
friendica 2014-01-19 22:28:46 -08:00
commit e54a501058
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/reddav.php
View File

@ -50,6 +50,9 @@ class RedDirectory extends DAV\Node implements DAV\ICollection {
function getChild($name) { function getChild($name) {
logger('RedDirectory::getChild : ' . $name, LOGGER_DATA); 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)) { if(get_config('system','block_public') && (! $this->auth->channel_id) && (! $this->auth->observer)) {

5
mod/search.php
View File

@ -8,11 +8,12 @@ function search_init(&$a) {
function search_content(&$a,$update = 0, $load = false) { function search_content(&$a,$update = 0, $load = false) {
if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) { if((get_config('system','block_public')) || (get_config('system','block_public_search'))) {
if ((! local_user()) && (! remote_user())) {
notice( t('Public access denied.') . EOL); notice( t('Public access denied.') . EOL);
return; return;
} }
}
nav_set_selected('search'); nav_set_selected('search');
require_once("include/bbcode.php"); require_once("include/bbcode.php");