diff options
| author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-09-30 12:21:36 +0200 |
|---|---|---|
| committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-09-30 12:21:36 +0200 |
| commit | e07ff7d3fbb9bef720831dc71470b70a882abfdf (patch) | |
| tree | 68934f0deb2fb9edef69954d1016734bc8662957 /mod/message.php | |
| parent | b22fa9f7f4b77569c29b0fc881373393281b7bf4 (diff) | |
| parent | e769fbaffb09aa673d7475c598e7df7e7978d210 (diff) | |
| download | volse-hubzilla-e07ff7d3fbb9bef720831dc71470b70a882abfdf.tar.gz volse-hubzilla-e07ff7d3fbb9bef720831dc71470b70a882abfdf.tar.bz2 volse-hubzilla-e07ff7d3fbb9bef720831dc71470b70a882abfdf.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)) { |