diff options
| author | Paolo Tacconi <p.tacconi@giunti.it> | 2016-04-15 09:20:58 +0200 |
|---|---|---|
| committer | Paolo Tacconi <p.tacconi@giunti.it> | 2016-04-15 09:20:58 +0200 |
| commit | 45a854762b451dafb882bc56efce054b64420627 (patch) | |
| tree | 958fcd22f04546f40b6ac68bb58cfe1a1b1fb7f6 /mod/fhublocs.php | |
| parent | 1806da0851dd5cf5978b19d12783ae3101a11257 (diff) | |
| parent | a29c0371f1f3cceb9a9af3a62e5ed67886869c40 (diff) | |
| download | volse-hubzilla-45a854762b451dafb882bc56efce054b64420627.tar.gz volse-hubzilla-45a854762b451dafb882bc56efce054b64420627.tar.bz2 volse-hubzilla-45a854762b451dafb882bc56efce054b64420627.zip | |
Resolved conflict in view/it/hstrings.php
Diffstat (limited to 'mod/fhublocs.php')
| -rw-r--r-- | mod/fhublocs.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mod/fhublocs.php b/mod/fhublocs.php index dce00e383..7eab2b811 100644 --- a/mod/fhublocs.php +++ b/mod/fhublocs.php @@ -38,7 +38,7 @@ function fhublocs_content(&$a) { if($y) $primary_address = $y[0]['xchan_addr']; - $hub_address = $rr['channel']['channel_address'] . '@' . get_app()->get_hostname(); + $hub_address = $rr['channel']['channel_address'] . '@' . App::get_hostname(); $primary = (($hub_address === $primary_address) ? 1 : 0); @@ -57,11 +57,11 @@ function fhublocs_content(&$a) { dbesc($rr['channel_guid']), dbesc($rr['channel_guid_sig']), dbesc($rr['channel_hash']), - dbesc($rr['channel_address'] . '@' . get_app()->get_hostname()), + dbesc($rr['channel_address'] . '@' . App::get_hostname()), intval($primary), dbesc(z_root()), dbesc(base64url_encode(rsa_sign(z_root(),$rr['channel_prvkey']))), - dbesc(get_app()->get_hostname()), + dbesc(App::get_hostname()), dbesc(z_root() . '/post'), dbesc($sitekey), dbesc('zot') |