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/lockview.php b/mod/lockview.php
index e39f2707b..a46fb6d69 100644
--- a/mod/lockview.php
+++ b/mod/lockview.php
@@ -27,7 +27,7 @@ function lockview_content(&$a) {
 
 	$item = $r[0];
 
-	if($item['uid'] != local_user()) {
+	if($item['uid'] != local_channel()) {
 		echo '<li>' . t('Remote privacy information not available.') . '</li>';
 		killme();
 	}