diff options
| author | Paolo Tacconi <p.tacconi@giunti.it> | 2016-04-15 09:22:27 +0200 |
|---|---|---|
| committer | Paolo Tacconi <p.tacconi@giunti.it> | 2016-04-15 09:22:27 +0200 |
| commit | c38c79d71c8ef70ef649f83e322f1984b75ee2dd (patch) | |
| tree | 958fcd22f04546f40b6ac68bb58cfe1a1b1fb7f6 /mod/message.php | |
| parent | 1806da0851dd5cf5978b19d12783ae3101a11257 (diff) | |
| parent | 45a854762b451dafb882bc56efce054b64420627 (diff) | |
| download | volse-hubzilla-c38c79d71c8ef70ef649f83e322f1984b75ee2dd.tar.gz volse-hubzilla-c38c79d71c8ef70ef649f83e322f1984b75ee2dd.tar.bz2 volse-hubzilla-c38c79d71c8ef70ef649f83e322f1984b75ee2dd.zip | |
Merge branch 'redmatrix-master'
Diffstat (limited to 'mod/message.php')
| -rw-r--r-- | mod/message.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mod/message.php b/mod/message.php index 73239d2cb..f6d1d020c 100644 --- a/mod/message.php +++ b/mod/message.php @@ -17,7 +17,7 @@ function message_content(&$a) { return login(); } - $channel = $a->get_channel(); + $channel = App::get_channel(); head_set_icon($channel['xchan_photo_s']); $cipher = get_pconfig(local_channel(),'system','default_cipher'); @@ -32,7 +32,7 @@ function message_content(&$a) { $r = private_messages_drop(local_channel(), argv(2), true); if($r) info( t('Conversation removed.') . EOL ); - goaway($a->get_baseurl(true) . '/mail/combined' ); + goaway(z_root() . '/mail/combined' ); } if(argc() == 2) { @@ -56,7 +56,7 @@ function message_content(&$a) { // private_messages_list() can do other more complicated stuff, for now keep it simple - $r = private_messages_list(local_channel(), $mailbox, $a->pager['start'], $a->pager['itemspage']); + $r = private_messages_list(local_channel(), $mailbox, App::$pager['start'], App::$pager['itemspage']); if(! $r) { info( t('No messages.') . EOL); |