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/authtest.php b/mod/authtest.php
index b6d940db2..6ef6c22ad 100644
--- a/mod/authtest.php
+++ b/mod/authtest.php
@@ -9,7 +9,7 @@ function authtest_content(&$a) {
 	$auth_success = false;
 	$o .= '<h3>Magic-Auth Diagnostic</h3>';
 
-	if(! local_user()) {
+	if(! local_channel()) {
 		notice( t('Permission denied.') . EOL);
 		return $o;
 	}