just hostname not url in hm:host - host xrd document

diff --git a/boot.php b/boot.php
index 24f9652835ef2054e9b178a589bc50e9150ba2c5..07fa64bbc1e5457b9a821c819dbc8ce6dbdd8672 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -8,7 +8,7 @@ require_once("include/pgettext.php");
 require_once('include/nav.php');
 
 define ( 'FRIENDIKA_PLATFORM',     'Free Friendika');
-define ( 'FRIENDIKA_VERSION',      '2.3.1117' );
+define ( 'FRIENDIKA_VERSION',      '2.3.1118' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.21'    );
 define ( 'DB_UPDATE_VERSION',      1092      );
 

diff --git a/mod/hostxrd.php b/mod/hostxrd.php
index a1c24765b4a40e28755961ed22550f4a59c27178..fe61a874c36ad952f034fd57fb183634a3073036 100644 (file)
--- a/mod/hostxrd.php
+++ b/mod/hostxrd.php
@@ -32,7 +32,7 @@ function hostxrd_init(&$a) {
 
        $tpl = file_get_contents('view/xrd_host.tpl');
        echo str_replace(array(
-               '$zroot','$domain','$zot_post','$bigkey'),array(z_root(),z_path(),z_root() . '/post', salmon_key(get_config('system','site_pubkey'))),$tpl);
+               '$zhost','$zroot','$domain','$zot_post','$bigkey'),array($a->get_hostname(),z_root(),z_path(),z_root() . '/post', salmon_key(get_config('system','site_pubkey'))),$tpl);
        session_write_close();
        exit();
 

diff --git a/view/xrd_host.tpl b/view/xrd_host.tpl
index ee34c1e468c37793d4594cd7be7e7358deddf12c..dbb20256f93fd5f3828210bb7a0f63bfe72b39c5 100644 (file)
--- a/view/xrd_host.tpl
+++ b/view/xrd_host.tpl
@@ -2,7 +2,7 @@
 <XRD xmlns='http://docs.oasis-open.org/ns/xri/xrd-1.0'
      xmlns:hm='http://host-meta.net/xrd/1.0'>
  
-    <hm:Host>$zroot</hm:Host>
+    <hm:Host>$zhost</hm:Host>
  
     <Link rel='lrdd' template='$domain/xrd/?uri={uri}' />
     <Link rel='acct-mgmt' href='$domain/amcd' />