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/mod/poke.php b/mod/poke.php
index 9fde46f62..d0f60e853 100755
--- a/mod/poke.php
+++ b/mod/poke.php
@@ -18,10 +18,10 @@ require_once('include/items.php');
 
 function poke_init(&$a) {
 
-	if(! local_user())
+	if(! local_channel())
 		return;
 
-	$uid = local_user();
+	$uid = local_channel();
 	$channel = $a->get_channel();
 
 	$verb = notags(trim($_REQUEST['verb']));
@@ -128,7 +128,7 @@ function poke_init(&$a) {
 
 function poke_content(&$a) {
 
-	if(! local_user()) {
+	if(! local_channel()) {
 		notice( t('Permission denied.') . EOL);
 		return;
 	}
@@ -140,7 +140,7 @@ function poke_content(&$a) {
 		$r = q("select abook_id, xchan_name from abook left join xchan on abook_xchan = xchan_hash 
 			where abook_id = %d and abook_channel = %d limit 1",
 			intval($_REQUEST['c']),
-			intval(local_user())
+			intval(local_channel())
 		);
 		if($r) {
 			$name = $r[0]['xchan_name'];