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

diff --git a/mod/zping.php b/mod/zping.php
index 76f4470c1..311517701 100644
--- a/mod/zping.php
+++ b/mod/zping.php
@@ -12,7 +12,7 @@ function zping_content(&$a) {
 
 	// Remember to add '/post' to the url
 
-	if(! local_user())
+	if(! local_channel())
 		return;
 
 	$url = $_REQUEST['url'];