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/profile.php b/mod/profile.php
index 792bf34c5..430d039e9 100644
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -21,12 +21,12 @@ function profile_init(&$a) {
 	$profile = '';
 	$channel = $a->get_channel();
 
-	if((local_user()) && (argc() > 2) && (argv(2) === 'view')) {
+	if((local_channel()) && (argc() > 2) && (argv(2) === 'view')) {
 		$which = $channel['channel_address'];
 		$profile = argv(1);		
 		$r = q("select profile_guid from profile where id = %d and uid = %d limit 1",
 			intval($profile),
-			intval(local_user())
+			intval(local_channel())
 		);
 		if(! $r)
 			$profile = '';
@@ -51,7 +51,7 @@ function profile_init(&$a) {
 
 function profile_content(&$a, $update = 0) {
 
-	if(get_config('system','block_public') && (! get_account_id()) && (! remote_user())) {
+	if(get_config('system','block_public') && (! get_account_id()) && (! remote_channel())) {
 			return login();
 	}
 
@@ -66,9 +66,9 @@ function profile_content(&$a, $update = 0) {
 	}
 
 
-	$is_owner = ((local_user()) && (local_user() == $a->profile['profile_uid']) ? true : false);
+	$is_owner = ((local_channel()) && (local_channel() == $a->profile['profile_uid']) ? true : false);
 
-	if($a->profile['hidewall'] && (! $is_owner) && (! remote_user())) {
+	if($a->profile['hidewall'] && (! $is_owner) && (! remote_channel())) {
 		notice( t('Permission denied.') . EOL);
 		return;
 	}