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

diff --git a/mod/oexchange.php b/mod/oexchange.php
index 27c8b388d..a684bd5d8 100644
--- a/mod/oexchange.php
+++ b/mod/oexchange.php
@@ -14,8 +14,8 @@ function oexchange_init(&$a) {
 
 function oexchange_content(&$a) {
 
-	if(! local_user()) {
-		if(remote_user()) {
+	if(! local_channel()) {
+		if(remote_channel()) {
 			$observer = $a->get_observer();
 			if($observer && $observer['xchan_url']) {
 				$parsed = @parse_url($observer['xchan_url']);
@@ -57,7 +57,7 @@ function oexchange_content(&$a) {
 
 	$post = array();
 
-	$post['profile_uid'] = local_user();
+	$post['profile_uid'] = local_channel();
 	$post['return'] = '/oexchange/done' ;
 	$post['body'] = $s;
 	$post['type'] = 'wall';