diff options
| author | Michael Vogel <icarus@dabo.de> | 2012-03-28 19:52:30 +0200 |
|---|---|---|
| committer | Michael Vogel <icarus@dabo.de> | 2012-03-28 19:52:30 +0200 |
| commit | bdd275474044152a5d9a33ea6b8a8071b931d27e (patch) | |
| tree | b10c2b68e0236925992449786d70f45aaca21984 /mod/message.php | |
| parent | 792edfe9c834e3daeae598727e4cb15dc0ff8475 (diff) | |
| parent | e894775a39920edc0e438364c818357ab809bace (diff) | |
| download | volse-hubzilla-bdd275474044152a5d9a33ea6b8a8071b931d27e.tar.gz volse-hubzilla-bdd275474044152a5d9a33ea6b8a8071b931d27e.tar.bz2 volse-hubzilla-bdd275474044152a5d9a33ea6b8a8071b931d27e.zip | |
Merge commit 'upstream/master'
Diffstat (limited to 'mod/message.php')
| -rwxr-xr-x | mod/message.php | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/mod/message.php b/mod/message.php index 55e313776..8991f643d 100755 --- a/mod/message.php +++ b/mod/message.php @@ -15,6 +15,13 @@ function message_post(&$a) { $body = ((x($_REQUEST,'body')) ? escape_tags(trim($_REQUEST['body'])) : ''); $recipient = ((x($_REQUEST,'messageto')) ? intval($_REQUEST['messageto']) : 0 ); + // Work around doubled linefeeds in Tinymce 3.5b2 + + $plaintext = intval(get_pconfig(local_user(),'system','plaintext')); + if(! $plaintext) { + $body = str_replace("\r\n","\n",$body); + $body = str_replace("\n\n","\n",$body); + } $ret = send_message($recipient, $body, $subject, $replyto); $norecip = false; @@ -154,7 +161,7 @@ function message_content(&$a) { $preselect = (isset($a->argv[2])?array($a->argv[2]):false); - $select = contact_select('messageto','message-to-select', $preselect, 4, true); + $select = contact_select('messageto','message-to-select', $preselect, 4, true, false, false, 10); $tpl = get_markup_template('prv_message.tpl'); $o .= replace_macros($tpl,array( '$header' => t('Send Private Message'), |