diff options
| author | redmatrix <mike@macgirvin.com> | 2016-09-21 15:28:37 -0700 |
|---|---|---|
| committer | redmatrix <mike@macgirvin.com> | 2016-09-21 15:28:37 -0700 |
| commit | b5d093e5caa87517280912e40a0f47352dca3f04 (patch) | |
| tree | 0f0fd61b2740feadd9985eecb2d28d85401ed4f6 /Zotlabs | |
| parent | 10a52977f8b44ef0e1dcf1d89b51a0330340472e (diff) | |
| download | volse-hubzilla-b5d093e5caa87517280912e40a0f47352dca3f04.tar.gz volse-hubzilla-b5d093e5caa87517280912e40a0f47352dca3f04.tar.bz2 volse-hubzilla-b5d093e5caa87517280912e40a0f47352dca3f04.zip | |
finish the channel_reddress() conversion
Diffstat (limited to 'Zotlabs')
| -rw-r--r-- | Zotlabs/Lib/Enotify.php | 2 | ||||
| -rw-r--r-- | Zotlabs/Lib/SuperCurl.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Zotlabs/Lib/Enotify.php b/Zotlabs/Lib/Enotify.php index 683e91b52..92b9fddbd 100644 --- a/Zotlabs/Lib/Enotify.php +++ b/Zotlabs/Lib/Enotify.php @@ -465,7 +465,7 @@ class Enotify { // use $_SESSION['zid_override'] to force zid() to use // the recipient address instead of the current observer - $_SESSION['zid_override'] = $recip['channel_address'] . '@' . \App::get_hostname(); + $_SESSION['zid_override'] = channel_reddress($recip); $_SESSION['zrl_override'] = z_root() . '/channel/' . $recip['channel_address']; $textversion = zidify_links($textversion); diff --git a/Zotlabs/Lib/SuperCurl.php b/Zotlabs/Lib/SuperCurl.php index 1c8583ff5..462a62b36 100644 --- a/Zotlabs/Lib/SuperCurl.php +++ b/Zotlabs/Lib/SuperCurl.php @@ -105,7 +105,7 @@ class SuperCurl { $opts['cookie'] = 'PHPSESSID=' . trim(file_get_contents('store/[data]/cookien_' . $this->magicauth)); $c = channelx_by_n($this->magicauth); if($c) - $url = zid($this->url,$c['channel_address'] . '@' . \App::get_hostname()); + $url = zid($this->url,channel_reddress($c)); } if($this->custom) $opts['custom'] = $this->custom; |