diff options
| author | zotlabs <mike@macgirvin.com> | 2017-04-26 20:11:12 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-04-26 20:11:12 -0700 |
| commit | 88149f56bb2d2fb8f4a02cc320e5ba83435d8acc (patch) | |
| tree | 8fd1c67cc364af4dee4ce81cd37befe4a9857e44 /Zotlabs | |
| parent | 6fcfab34883e5e93e9438ed4872de304e22b0f00 (diff) | |
| parent | 1c304eb8ba5395e62c0245133d58a3f00adaeaac (diff) | |
| download | volse-hubzilla-88149f56bb2d2fb8f4a02cc320e5ba83435d8acc.tar.gz volse-hubzilla-88149f56bb2d2fb8f4a02cc320e5ba83435d8acc.tar.bz2 volse-hubzilla-88149f56bb2d2fb8f4a02cc320e5ba83435d8acc.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
Diffstat (limited to 'Zotlabs')
| -rw-r--r-- | Zotlabs/Module/Mail.php | 20 | ||||
| -rw-r--r-- | Zotlabs/Module/Wfinger.php | 2 | ||||
| -rw-r--r-- | Zotlabs/Module/Xrd.php | 2 |
3 files changed, 12 insertions, 12 deletions
diff --git a/Zotlabs/Module/Mail.php b/Zotlabs/Module/Mail.php index 2fb89fed5..52f1ddf32 100644 --- a/Zotlabs/Module/Mail.php +++ b/Zotlabs/Module/Mail.php @@ -113,18 +113,18 @@ class Mail extends \Zotlabs\Web\Controller { if($preview) { $mail = [ - 'mailbox' => 'outbox', - 'id' => 0, - 'mid' => 'M0', - 'from_name' => $channel['xchan_name'], - 'from_url' => $channel['xchan_url'], - 'from_photo' => $channel['xchan_photo_s'], - 'subject' => zidify_links(smilies(bbcode($subject))), - 'body' => zidify_links(smilies(bbcode($body))), + 'mailbox' => 'outbox', + 'id' => 0, + 'mid' => 'M0', + 'from_name' => $channel['xchan_name'], + 'from_url' => $channel['xchan_url'], + 'from_photo' => $channel['xchan_photo_s'], + 'subject' => zidify_links(smilies(bbcode($subject))), + 'body' => zidify_links(smilies(bbcode($body))), 'attachments' => '', - 'can_recall' => false, + 'can_recall' => false, 'is_recalled' => '', - 'date' => datetime_convert('UTC',date_default_timezone_get(),$message['created'], 'c') + 'date' => datetime_convert('UTC',date_default_timezone_get(),$message['created'], 'c') ]; echo replace_macros(get_markup_template('mail_conv.tpl'), [ '$mail' => $mail ] ); diff --git a/Zotlabs/Module/Wfinger.php b/Zotlabs/Module/Wfinger.php index 3fdff691b..118ec5e7c 100644 --- a/Zotlabs/Module/Wfinger.php +++ b/Zotlabs/Module/Wfinger.php @@ -107,7 +107,7 @@ class Wfinger extends \Zotlabs\Web\Controller { [ 'rel' => 'http://schemas.google.com/g/2010#updates-from', 'type' => 'application/atom+xml', - 'href' => z_root() . '/feed/' . $r[0]['channel_address'] . '?f=&compat=1' + 'href' => z_root() . '/feed/' . $r[0]['channel_address'] . '/?compat=1' ], [ diff --git a/Zotlabs/Module/Xrd.php b/Zotlabs/Module/Xrd.php index ba650be55..7fd81e490 100644 --- a/Zotlabs/Module/Xrd.php +++ b/Zotlabs/Module/Xrd.php @@ -57,7 +57,7 @@ class Xrd extends \Zotlabs\Web\Controller { '$aliases' => $aliases, '$profile_url' => z_root() . '/channel/' . $r[0]['channel_address'], '$hcard_url' => z_root() . '/hcard/' . $r[0]['channel_address'], - '$atom' => z_root() . '/feed/' . $r[0]['channel_address'] . '?f=&compat=1', + '$atom' => z_root() . '/feed/' . $r[0]['channel_address'] . '/?compat=1', '$zot_post' => z_root() . '/post/' . $r[0]['channel_address'], '$poco_url' => z_root() . '/poco/' . $r[0]['channel_address'], '$photo' => z_root() . '/photo/profile/l/' . $r[0]['channel_id'], |