Merge branch 'master' into pocorate

1 files changed, 5 insertions, 5 deletions

diff --git a/mod/item.php b/mod/item.php
index b3370fecf..d8cbeadc7 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -26,12 +26,12 @@ function item_post(&$a) {
 	// This will change. Figure out who the observer is and whether or not
 	// they have permission to post here. Else ignore the post.
 
-	if((! local_user()) && (! remote_user()) && (! x($_REQUEST,'commenter')))
+	if((! local_channel()) && (! remote_channel()) && (! x($_REQUEST,'commenter')))
 		return;
 
 	require_once('include/security.php');
 
-	$uid = local_user();
+	$uid = local_channel();
 	$channel = null;
 	$observer = null;
 
@@ -640,7 +640,7 @@ function item_post(&$a) {
 		}
 	}
 
-	if(local_user() != $profile_uid)
+	if(local_channel() != $profile_uid)
 		$item_flags |= ITEM_UNSEEN;
 	
 	if($post_type === 'wall' || $post_type === 'wall-comment')
@@ -905,7 +905,7 @@ function item_post(&$a) {
 
 function item_content(&$a) {
 
-	if((! local_user()) && (! remote_user()))
+	if((! local_channel()) && (! remote_channel()))
 		return;
 
 	require_once('include/security.php');
@@ -920,7 +920,7 @@ function item_content(&$a) {
 		if($i) {
 			$can_delete = false;
 			$local_delete = false;
-			if(local_user() && local_user() == $i[0]['uid'])
+			if(local_channel() && local_channel() == $i[0]['uid'])
 				$local_delete = true;
 
 			$ob_hash = get_observer_hash();