Merge branch 'master' into tres

Conflicts:
	include/group.php
	include/text.php
	mod/acl.php
	mod/channel.php
	mod/connections.php
	mod/display.php
	mod/group.php
	mod/item.php
	mod/locs.php
	mod/network.php
	mod/photos.php
	mod/ping.php
	mod/starred.php
	mod/viewsrc.php

1 files changed, 1 insertions, 1 deletions

diff --git a/mod/dav.php b/mod/dav.php
index e3719cb93..f7f89b6da 100644
--- a/mod/dav.php
+++ b/mod/dav.php
@@ -59,7 +59,7 @@ function dav_init(&$a) {
 	$ob_hash = get_observer_hash();
 
 	if ($ob_hash) {
-		if (local_user()) {
+		if (local_channel()) {
 			$channel = $a->get_channel();
 			$auth->setCurrentUser($channel['channel_address']);
 			$auth->channel_id = $channel['channel_id'];