Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge

This commit is contained in:
zotlabs 2017-02-24 13:55:57 -08:00
commit 70f8840fbd

View File

@ -206,7 +206,7 @@ class Directory extends \Zotlabs\Web\Controller {
foreach($j['results'] as $rr) {
$profile_link = chanlink_hash($rr['hash']);
$profile_link = chanlink_url($rr['url']);
$pdesc = (($rr['description']) ? $rr['description'] . '<br />' : '');
$connect_link = ((local_channel()) ? z_root() . '/follow?f=&url=' . urlencode($rr['address']) : '');