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/rmagic.php b/mod/rmagic.php
index de81cdcde..49525bd32 100644
--- a/mod/rmagic.php
+++ b/mod/rmagic.php
@@ -3,7 +3,7 @@
 
 function rmagic_init(&$a) {
 
-	if(local_user())
+	if(local_channel())
 		goaway(z_root());
 
 	$me = get_my_address();