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

diff --git a/include/group.php b/include/group.php
index 08361a81d..1e718aeaa 100644
--- a/include/group.php
+++ b/include/group.php
@@ -202,8 +202,8 @@ function group_get_members($gid) {
 			LEFT JOIN abook ON abook_xchan = `group_member`.`xchan` left join xchan on xchan_hash = abook_xchan
 			WHERE `gid` = %d AND abook_channel = %d and `group_member`.`uid` = %d and xchan_deleted = 0 and not ( abook_flags & %d )>0 and not ( abook_flags & %d )>0 ORDER BY xchan_name ASC ",
 			intval($gid),
-			intval(local_user()),
-			intval(local_user()),
+			intval(local_channel()),
+			intval(local_channel()),
 			intval(ABOOK_FLAG_BLOCKED),
 			intval(ABOOK_FLAG_PENDING)
 		);
@@ -244,7 +244,7 @@ function group_side($every="connections",$each="group",$edit = false, $group_id
 
 	$o = '';
 
-	if(! local_user())
+	if(! local_channel())
 		return '';
 
 	$groups = array();
@@ -262,7 +262,7 @@ function group_side($every="connections",$each="group",$edit = false, $group_id
 	);
 	$member_of = array();
 	if($cid) {
-		$member_of = groups_containing(local_user(),$cid);
+		$member_of = groups_containing(local_channel(),$cid);
 	} 
 
 	if(count($r)) {