X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mod%2Fmessage.php;h=0a54f9428d1c60fd224eda6925ab5c73e3e4d484;hb=c3c2f0a6bd334dc0aa2d27ce71ba1a1d13ccc3c0;hp=83bad29d43647fea02fe1107e175a71dff5b59b4;hpb=10eb873f7c57329c1d6dd37f0b84df157ac35f7a;p=friendica.git diff --git a/mod/message.php b/mod/message.php index 83bad29d43..0a54f9428d 100644 --- a/mod/message.php +++ b/mod/message.php @@ -46,7 +46,11 @@ function message_post(&$a) { // Work around doubled linefeeds in Tinymce 3.5b2 - $plaintext = intval(get_pconfig(local_user(),'system','plaintext')); +/* $plaintext = intval(get_pconfig(local_user(),'system','plaintext') && !feature_enabled(local_user(),'richtext')); + if(! $plaintext) { + $body = fix_mce_lf($body); + }*/ + $plaintext = intval(!feature_enabled(local_user(),'richtext')); if(! $plaintext) { $body = fix_mce_lf($body); } @@ -78,6 +82,8 @@ function message_post(&$a) { $a->argc = 2; $a->argv[1] = 'new'; } + else + goaway($a->get_baseurl(true) . '/' . $_SESSION['return_url']); } @@ -181,6 +187,36 @@ function message_content(&$a) { if(($a->argc == 3) && ($a->argv[1] === 'drop' || $a->argv[1] === 'dropconv')) { if(! intval($a->argv[2])) return; + + // Check if we should do HTML-based delete confirmation + if($_REQUEST['confirm']) { + //