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/suggest.php b/mod/suggest.php
index 8a6b50b22..fec0e85a4 100644
--- a/mod/suggest.php
+++ b/mod/suggest.php
@@ -6,12 +6,12 @@ require_once('include/widgets.php');
 
 
 function suggest_init(&$a) {
-	if(! local_user())
+	if(! local_channel())
 		return;
 
 	if(x($_GET,'ignore')) {
 		q("insert into xign ( uid, xchan ) values ( %d, '%s' ) ",
-			intval(local_user()),
+			intval(local_channel()),
 			dbesc($_GET['ignore'])
 		);
 	}
@@ -22,14 +22,14 @@ function suggest_init(&$a) {
 function suggest_content(&$a) {
 
 	$o = '';
-	if(! local_user()) {
+	if(! local_channel()) {
 		notice( t('Permission denied.') . EOL);
 		return;
 	}
 
 	$_SESSION['return_url'] = $a->get_baseurl() . '/' . $a->cmd;
 
-	$r = suggestion_query(local_user(),get_observer_hash());
+	$r = suggestion_query(local_channel(),get_observer_hash());
 
 	if(! $r) {
 		info( t('No suggestions available. If this is a new site, please try again in 24 hours.'));