From 1cd3b4182595b838a535dd6b6990251db05d49e6 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Wed, 30 Mar 2016 22:13:24 -0700 Subject: deprecate $a->get_baseurl() --- mod/mail.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'mod/mail.php') diff --git a/mod/mail.php b/mod/mail.php index 59d15772b..32bb19952 100644 --- a/mod/mail.php +++ b/mod/mail.php @@ -149,7 +149,7 @@ function mail_content(&$a) { if($r) { //info( t('Message deleted.') . EOL ); } - goaway($a->get_baseurl(true) . '/mail/' . $mailbox); + goaway(z_root() . '/mail/' . $mailbox); } if((argc() == 4) && (argv(2) === 'recall')) { @@ -174,7 +174,7 @@ function mail_content(&$a) { if($r) { info( t('Message recalled.') . EOL ); } - goaway($a->get_baseurl(true) . '/mail/' . $mailbox . '/' . argv(3)); + goaway(z_root() . '/mail/' . $mailbox . '/' . argv(3)); } @@ -186,7 +186,7 @@ function mail_content(&$a) { $r = private_messages_drop(local_channel(), argv(3), true); if($r) info( t('Conversation removed.') . EOL ); - goaway($a->get_baseurl(true) . '/mail/' . $mailbox); + goaway(z_root() . '/mail/' . $mailbox); } if((argc() > 1) && (argv(1) === 'new')) { @@ -196,7 +196,7 @@ function mail_content(&$a) { $tpl = get_markup_template('msg-header.tpl'); $header = replace_macros($tpl, array( - '$baseurl' => $a->get_baseurl(true), + '$baseurl' => z_root(), '$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'), '$nickname' => $channel['channel_address'], '$linkurl' => t('Please enter a link URL:'), @@ -311,7 +311,7 @@ function mail_content(&$a) { $a->page['htmlhead'] .= replace_macros($tpl, array( '$nickname' => $channel['channel_address'], - '$baseurl' => $a->get_baseurl(true), + '$baseurl' => z_root(), '$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'), '$linkurl' => t('Please enter a link URL:'), '$expireswhen' => t('Expires YYYY-MM-DD HH:MM') -- cgit v1.2.3