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/share.php b/mod/share.php
index 78a25ee10..923971694 100644
--- a/mod/share.php
+++ b/mod/share.php
@@ -10,7 +10,7 @@ function share_init(&$a) {
 	if(! $post_id)
 		killme();
 
-	if(! (local_user() || remote_user()))
+	if(! (local_channel() || remote_channel()))
 		killme();
 
 
@@ -39,7 +39,7 @@ function share_init(&$a) {
 	// on your home site.
 	// When that works remove this next bit:
 
-	if(! local_user())
+	if(! local_channel())
 		killme();
 
 	xchan_query($r);
@@ -53,14 +53,14 @@ function share_init(&$a) {
 			"' avatar='".$r[0]['author']['xchan_photo_s'].
 			"' link='".$r[0]['plink'].
 			"' posted='".$r[0]['created'].
-			"' message_id='".$r[0]['mid']."']\n";
+			"' message_id='".$r[0]['mid']."']";
 		if($r[0]['title'])
 			$o .= '[b]'.$r[0]['title'].'[/b]'."\n";
 		$o .= $r[0]['body'];
 		$o.= "[/share]";
 	}
 
-	if(local_user()) {
+	if(local_channel()) {
 		echo $o;
 		killme();
 	}