Merge branch '1.10RC' of https://github.com/redmatrix/hubzilla into 1.10RC_merge

This commit is contained in:
redmatrix 2016-07-21 20:06:08 -07:00
commit dca8a05026

View File

@ -165,7 +165,7 @@ class BasicAuth extends DAV\Auth\Backend\AbstractBasic {
function check(RequestInterface $request, ResponseInterface $response) { function check(RequestInterface $request, ResponseInterface $response) {
if(local_channel()) { if(local_channel()) {
this->setAuthenticated(\App::get_channel()); $this->setAuthenticated(\App::get_channel());
return [ true, $this->principalPrefix . $this->channel_name ]; return [ true, $this->principalPrefix . $this->channel_name ];
} }
@ -263,4 +263,4 @@ class BasicAuth extends DAV\Auth\Backend\AbstractBasic {
logger('owner_id ' . $this->owner_id, LOGGER_DATA); logger('owner_id ' . $this->owner_id, LOGGER_DATA);
logger('owner_nick ' . $this->owner_nick, LOGGER_DATA); logger('owner_nick ' . $this->owner_nick, LOGGER_DATA);
} }
} }