harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '2.2RC' of https://github.com/redmatrix/hubzilla into 2.2RC_merge

Browse Source
This commit is contained in:
zotlabs 2017-02-25 13:57:08 -08:00
commit 4b1f87050f
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Zotlabs/Module/Directory.php
View File

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

2
boot.php
View File

@ -50,7 +50,7 @@ require_once('include/hubloc.php');
define ( 'PLATFORM_NAME', 'hubzilla' ); define ( 'PLATFORM_NAME', 'hubzilla' );
define ( 'STD_VERSION', '2.1' ); define ( 'STD_VERSION', '2.2RC' );
define ( 'ZOT_REVISION', '1.2' ); define ( 'ZOT_REVISION', '1.2' );
define ( 'DB_UPDATE_VERSION', 1188 ); define ( 'DB_UPDATE_VERSION', 1188 );