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/subthread.php b/mod/subthread.php
index f4472cf05..9cfe5c24d 100755
--- a/mod/subthread.php
+++ b/mod/subthread.php
@@ -7,7 +7,7 @@ require_once('include/items.php');
 
 function subthread_content(&$a) {
 
-	if((! local_user()) && (! remote_user())) {
+	if((! local_channel()) && (! remote_channel())) {
 		return;
 	}