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

2 files changed, 2 insertions, 2 deletions

diff --git a/Zotlabs/Module/Directory.php b/Zotlabs/Module/Directory.php
index 583154526..59ae88857 100644
--- a/Zotlabs/Module/Directory.php
+++ b/Zotlabs/Module/Directory.php
@@ -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']) : ''); 		
diff --git a/boot.php b/boot.php
index 7120632f4..25797d202 100755
--- a/boot.php
+++ b/boot.php
@@ -50,7 +50,7 @@ require_once('include/hubloc.php');
 
 
 define ( 'PLATFORM_NAME',           'hubzilla' );
-define ( 'STD_VERSION',             '2.1' );
+define ( 'STD_VERSION',             '2.2RC' );
 define ( 'ZOT_REVISION',            '1.2' );
 
 define ( 'DB_UPDATE_VERSION',       1188  );