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

diff --git a/mod/contactgroup.php b/mod/contactgroup.php
index 4515c4c4c..6138f9e19 100644
--- a/mod/contactgroup.php
+++ b/mod/contactgroup.php
@@ -4,14 +4,14 @@ require_once('include/group.php');
 
 function contactgroup_content(&$a) {
 
-	if(! local_user()) {
+	if(! local_channel()) {
 		killme();
 	}
 
 	if((argc() > 2) && (intval(argv(1))) && (argv(2))) {
 		$r = q("SELECT abook_xchan from abook where abook_xchan = '%s' and abook_channel = %d and not ( abook_flags & %d )>0 limit 1",
 			dbesc(base64url_decode(argv(2))),
-			intval(local_user()),
+			intval(local_channel()),
 			intval(ABOOK_FLAG_SELF)
 		);
 		if($r)
@@ -22,7 +22,7 @@ function contactgroup_content(&$a) {
 
 		$r = q("SELECT * FROM `groups` WHERE `id` = %d AND `uid` = %d AND `deleted` = 0 LIMIT 1",
 			intval(argv(1)),
-			intval(local_user())
+			intval(local_channel())
 		);
 		if(! $r) {
 			killme();
@@ -38,10 +38,10 @@ function contactgroup_content(&$a) {
 
 		if($change) {
 			if(in_array($change,$preselected)) {
-				group_rmv_member(local_user(),$group['name'],$change);
+				group_rmv_member(local_channel(),$group['name'],$change);
 			}
 			else {
-				group_add_member(local_user(),$group['name'],$change);
+				group_add_member(local_channel(),$group['name'],$change);
 			}
 		}
 	}