diff options
| author | zottel <github@zottel.net> | 2015-09-29 12:40:24 +0200 |
|---|---|---|
| committer | zottel <github@zottel.net> | 2015-09-29 12:40:24 +0200 |
| commit | f950d27b3debfe08e022a477dbfb4fac101106e4 (patch) | |
| tree | 38f62f0828163715c634e17290e2d77eb29d1b32 /mod/message.php | |
| parent | 8e410f14b1b5b23e4c7e41d4902ac7b9cb529c1b (diff) | |
| parent | 2a2da48d1871f408232a8397632f06528c8b43ae (diff) | |
| download | volse-hubzilla-f950d27b3debfe08e022a477dbfb4fac101106e4.tar.gz volse-hubzilla-f950d27b3debfe08e022a477dbfb4fac101106e4.tar.bz2 volse-hubzilla-f950d27b3debfe08e022a477dbfb4fac101106e4.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'mod/message.php')
| -rw-r--r-- | mod/message.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mod/message.php b/mod/message.php index f8d71aa44..73239d2cb 100644 --- a/mod/message.php +++ b/mod/message.php @@ -24,7 +24,7 @@ function message_content(&$a) { if(! $cipher) $cipher = 'aes256'; - +/* if((argc() == 3) && (argv(1) === 'dropconv')) { if(! intval(argv(2))) return; @@ -34,7 +34,7 @@ function message_content(&$a) { info( t('Conversation removed.') . EOL ); goaway($a->get_baseurl(true) . '/mail/combined' ); } -/* + if(argc() == 2) { switch(argv(1)) { |