From 0f31f705e8f41cbaf212ad52099745d6eaf039d2 Mon Sep 17 00:00:00 2001
From: Elmar Ludwig <elmar.ludwig@uni-osnabrueck.de>
Date: Thu, 10 Aug 2023 12:41:47 +0000
Subject: [PATCH] don't add (purely cosmetic) newline after HTML marker, fixes
#2950
Closes #2950
Merge request studip/studip!1985
---
lib/classes/Markup.class.php | 2 +-
resources/assets/javascripts/lib/wysiwyg.js | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/classes/Markup.class.php b/lib/classes/Markup.class.php
index 64aa5fe384e..77628ad1628 100644
--- a/lib/classes/Markup.class.php
+++ b/lib/classes/Markup.class.php
@@ -144,7 +144,7 @@ class Markup
if (self::hasHtmlMarker($text) || trim($text) === '') {
return $text; // marker already set, don't set twice
}
- return self::HTML_MARKER . PHP_EOL . $text;
+ return self::HTML_MARKER . $text;
}
/**
diff --git a/resources/assets/javascripts/lib/wysiwyg.js b/resources/assets/javascripts/lib/wysiwyg.js
index e36c2f70e32..b462602effb 100644
--- a/resources/assets/javascripts/lib/wysiwyg.js
+++ b/resources/assets/javascripts/lib/wysiwyg.js
@@ -25,7 +25,7 @@ const wysiwyg = {
if (this.hasHtmlMarker(text) || text.trim() == '') {
return text; // marker already set, don't set twice
}
- return this.htmlMarker + '\n' + text;
+ return this.htmlMarker + text;
},
getEditor,
--
GitLab