From 2a352732b5b2d086cdd1088883bc847adef3742b Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Sun, 22 May 2016 08:43:34 -0400
Subject: [PATCH] Use minified publickey.js (with cache-buster) when available (#5254)
---
program/steps/mail/compose.inc | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc
index 0fb6140..b2b32b3 100644
--- a/program/steps/mail/compose.inc
+++ b/program/steps/mail/compose.inc
@@ -285,6 +285,7 @@
// process $MESSAGE body/attachments, set $MESSAGE_BODY/$HTML_MODE vars and some session data
$MESSAGE_BODY = rcmail_prepare_message_body();
+$OUTPUT->include_script('publickey.js');
// register UI objects
$OUTPUT->add_handlers(array(
@@ -1058,9 +1059,6 @@
$reply_mode = intval($RCMAIL->config->get('reply_mode'));
if (!$bodyIsHtml) {
- $body = preg_replace('/\r?\n/', "\n", $body);
- $body = trim($body, "\n");
-
// soft-wrap and quote message text
$body = rcmail_wrap_and_quote($body, $LINE_LENGTH);
--
Gitblit v1.9.1