Merge pull request #2179 from nextcloud/fix/reply-quote-new-lines

Fix unnecessary line breaks in quoted reply text

lib/Service/Html.php

@@ -98,12 +98,12 @@ class Html {
 		$signature = null;
 		$parts = explode("-- \r\n", $body);
 		if (count($parts) > 1) {
-			$signature = nl2br(array_pop($parts));
+			$signature = array_pop($parts);
 			$body = implode("-- \r\n", $parts);
 		}
 
 		return [
-			nl2br($body),
+			$body,
 			$signature
 		];
 	}

src/components/MessagePlainTextBody.vue

 <template>
 	<div>
-		<div id="mail-content" v-html="body"></div>
-		<div v-if="signature" class="mail-signature" v-html="signature"></div>
+		<div id="mail-content" v-html="htmlBody"></div>
+		<div v-if="signature" class="mail-signature" v-html="htmlSignature"></div>
 	</div>
 </template>
 
@@ -18,6 +18,19 @@ export default {
 			default: () => undefined,
 		},
 	},
+	computed: {
+		htmlBody() {
+			return this.nl2br(this.body)
+		},
+		htmlSignature() {
+			return this.nl2br(this.signature)
+		},
+	},
+	methods: {
+		nl2br(str) {
+			return str.replace(/(\r\n|\n\r|\n|\r)/g, '<br />')
+		},
+	},
 }
 </script>
 

tests/Service/HtmlTest.php

@@ -82,7 +82,7 @@ class HtmlTest extends TestCase {
 		return [
 				['abc', null, 'abc'],
 				['abc', 'def', "abc-- \r\ndef"],
-				["abc-- <br />\r\ndef", 'ghi', "abc-- \r\ndef-- \r\nghi"],
+				["abc-- \r\ndef", 'ghi', "abc-- \r\ndef-- \r\nghi"],
 		];
 	}