aboutsummaryrefslogtreecommitdiffstats
path: root/mod/message.php
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2015-01-29 15:09:35 -0800
committerfriendica <info@friendica.com>2015-01-29 15:09:35 -0800
commit912be23e1627211fb417c4b7bced414cbbe38ef0 (patch)
tree2b8567d800624167b3eadf37c8855deb0ba74b0b /mod/message.php
parentff68ea608786a698ad46637ef13854ac1b1e6beb (diff)
parent872b165eb2bb5d632a12f2d7e1a28e195c2d5348 (diff)
downloadvolse-hubzilla-912be23e1627211fb417c4b7bced414cbbe38ef0.tar.gz
volse-hubzilla-912be23e1627211fb417c4b7bced414cbbe38ef0.tar.bz2
volse-hubzilla-912be23e1627211fb417c4b7bced414cbbe38ef0.zip
Merge branch 'master' into tres
Conflicts: include/group.php include/text.php mod/acl.php mod/channel.php mod/connections.php mod/display.php mod/group.php mod/item.php mod/locs.php mod/network.php mod/photos.php mod/ping.php mod/starred.php mod/viewsrc.php
Diffstat (limited to 'mod/message.php')
-rw-r--r--mod/message.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/mod/message.php b/mod/message.php
index 7f3b6180a..4a1ff26d1 100644
--- a/mod/message.php
+++ b/mod/message.php
@@ -12,7 +12,7 @@ function message_content(&$a) {
$o = '';
nav_set_selected('messages');
- if(! local_user()) {
+ if(! local_channel()) {
notice( t('Permission denied.') . EOL);
return login();
}
@@ -20,7 +20,7 @@ function message_content(&$a) {
$channel = $a->get_channel();
head_set_icon($channel['xchan_photo_s']);
- $cipher = get_pconfig(local_user(),'system','default_cipher');
+ $cipher = get_pconfig(local_channel(),'system','default_cipher');
if(! $cipher)
$cipher = 'aes256';
@@ -36,7 +36,7 @@ function message_content(&$a) {
if(! intval(argv(2)))
return;
$cmd = argv(1);
- $r = private_messages_drop(local_user(), argv(2), true);
+ $r = private_messages_drop(local_channel(), argv(2), true);
if($r)
info( t('Conversation removed.') . EOL );
goaway($a->get_baseurl(true) . '/message' );
@@ -50,7 +50,7 @@ function message_content(&$a) {
// private_messages_list() can do other more complicated stuff, for now keep it simple
- $r = private_messages_list(local_user(), '', $a->pager['start'], $a->pager['itemspage']);
+ $r = private_messages_list(local_channel(), '', $a->pager['start'], $a->pager['itemspage']);
if(! $r) {
info( t('No messages.') . EOL);