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, 2 insertions, 2 deletions

diff --git a/mod/magic.php b/mod/magic.php
index aead559a7..c31fa71ae 100644
--- a/mod/magic.php
+++ b/mod/magic.php
@@ -76,7 +76,7 @@ function magic_init(&$a) {
 	// By default, we'll proceed without asking.
 
 	$arr = array(
-		'channel_id' => local_user(),
+		'channel_id' => local_channel(),
 		'xchan' => $x[0],
 		'destination' => $dest, 
 		'proceed' => true
@@ -103,7 +103,7 @@ function magic_init(&$a) {
 		goaway($dest);
 	}
 
-	if(local_user()) {
+	if(local_channel()) {
 		$channel = $a->get_channel();
 
 		$token = random_string();