Merge pull request #4418 from pixelfed/staging

Staging

CHANGELOG.md

@@ -8,6 +8,7 @@
 ### Updates
 - Update StatusService, fix bug in getFull method ([4d8b4dcf](https://github.com/pixelfed/pixelfed/commit/4d8b4dcf))
 - Update Config, bump version for post edit support without having to clear cache ([c0190d84](https://github.com/pixelfed/pixelfed/commit/c0190d84))
+- Update EditHistoryModal, fix caption rendering ([0f803446](https://github.com/pixelfed/pixelfed/commit/0f803446))
 -  ([](https://github.com/pixelfed/pixelfed/commit/))
 
 ## [v0.11.7 (2023-05-24)](https://github.com/pixelfed/pixelfed/compare/v0.11.6...v0.11.7)

app/Http/Controllers/StatusEditController.php

@@ -44,8 +44,9 @@ class StatusEditController extends Controller
     	$cached = StatusService::get($status->id, false);
 
     	$res = $status->edits->map(function($edit) use($cached) {
+    		$caption = nl2br(strip_tags(str_replace('</p>', "\n", $edit->caption)));
     		return [
-    			'content' => Autolink::create()->autolink($edit->caption),
+    			'content' => Autolink::create()->autolink($caption),
     			'spoiler_text' => $edit->spoiler_text,
     			'sensitive' => (bool) $edit->is_nsfw,
     			'created_at' => str_replace('+00:00', 'Z', $edit->created_at->format(DATE_RFC3339_EXTENDED)),

resources/assets/components/partials/post/EditHistoryModal.vue

@@ -121,7 +121,9 @@
 							</div>
 						</div>
 					</template>
-					<p class="lead my-4" v-html="allHistory[historyIndex].content"></p>
+					<div class="w-100 my-4 px-4 text-break justify-content-start">
+						<p class="mb-0" v-html="allHistory[historyIndex].content"></p>
+					</div>
 				</div>
 			</template>