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

diff --git a/mod/hcard.php b/mod/hcard.php
index 3cb2fa01e..014a63b35 100644
--- a/mod/hcard.php
+++ b/mod/hcard.php
@@ -13,12 +13,12 @@ function hcard_init(&$a) {
     $profile = '';
     $channel = $a->get_channel();
 
-    if((local_user()) && (argc() > 2) && (argv(2) === 'view')) {
+    if((local_channel()) && (argc() > 2) && (argv(2) === 'view')) {
         $which = $channel['channel_address'];
         $profile = argv(1);
         $r = q("select profile_guid from profile where id = %d and uid = %d limit 1",
             intval($profile),
-            intval(local_user())
+            intval(local_channel())
         );
         if(! $r)
             $profile = '';