Merge pull request #1028 from nextcloud/html-whitespace

preserve some of the whitespace from html tags

1 files changed, 5 insertions, 1 deletions

diff --git a/lib/Model/ActivityPub/ACore.php b/lib/Model/ActivityPub/ACore.php
index 248ee953..6609000d 100644
--- a/lib/Model/ActivityPub/ACore.php
+++ b/lib/Model/ActivityPub/ACore.php
@@ -563,10 +563,14 @@ class ACore extends Item implements JsonSerializable {
 				return $value;
 
 			case self::AS_STRING:
+				// try to preserve some whitespace from the html tags
+				$value = preg_replace("/\<br *\/?\>/", "\n", $value);
+				$value = preg_replace("/\<\/?p>/", "\n", $value);
+
 				$value = strip_tags($value);
 				$value = html_entity_decode($value, ENT_QUOTES | ENT_HTML5);
 
-				return $value;
+				return trim($value);
 
 			case self::AS_USERNAME:
 				$value = strip_tags($value);