summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorthomascube <thomas@roundcube.net>2008-12-30 13:30:20 +0000
committerthomascube <thomas@roundcube.net>2008-12-30 13:30:20 +0000
commit27806471142e74d667e5828dfdc1a0ec9d4f410c (patch)
treedf315a88999c192c88aee9552d1ae5581ea18ae0
parent64db7e176efda9749757677699d2be508c150fca (diff)
Use <pre> instead of <div class=pre>: Fix line-break issue when copy & paste in Firefox (#1485425)
-rw-r--r--program/steps/mail/func.inc6
-rw-r--r--skins/default/mail.css1
2 files changed, 4 insertions, 3 deletions
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index b3d7cfc85..3fcdeb0b2 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -755,8 +755,8 @@ function rcmail_print_body($part, $p = array())
// insert the links for urls and mailtos
$body = preg_replace("/##string_replacement\{([0-9]+)\}##/e", "\$replace_strings[\\1]", join("\n", $a_lines));
-
- return "<div class=\"pre\">".$body."\n</div>";
+
+ return html::tag('pre', array(), $body);
}
/**
@@ -924,7 +924,7 @@ function rcmail_message_body($attrib)
}
}
else
- $out .= html::div('message-part', html::div('pre', Q($MESSAGE->body)));
+ $out .= html::div('message-part', html::tag('pre', array(), Q($MESSAGE->body)));
$ctype_primary = strtolower($MESSAGE->structure->ctype_primary);
diff --git a/skins/default/mail.css b/skins/default/mail.css
index 18fcd127f..9590ba947 100644
--- a/skins/default/mail.css
+++ b/skins/default/mail.css
@@ -820,6 +820,7 @@ div.message-htmlpart a
color: #0000CC;
}
+div.message-part pre,
div.message-part div.pre
{
margin: 0px;