From 8156b11de3d4a48e08924757911d90d7445cd41b Mon Sep 17 00:00:00 2001
From: Elmar Ludwig <elmar.ludwig@uni-osnabrueck.de>
Date: Sat, 1 Apr 2023 21:32:47 +0000
Subject: [PATCH] remove HTML before calculating changes in wiki, re #2477
Merge request studip/studip!1688
---
lib/wiki.inc.php | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/lib/wiki.inc.php b/lib/wiki.inc.php
index 84aa61b9ec1..30f68fead63 100644
--- a/lib/wiki.inc.php
+++ b/lib/wiki.inc.php
@@ -1660,14 +1660,14 @@ function showDiffs($keyword, $versions_since)
}
$version = array_shift($versions);
- $last = $version['body'];
+ $last = Studip\Markup::removeHtml($version['body']);
$lastversion = $version['version'];
$zusatz = getZusatz($version);
$content = '';
foreach ($versions as $version) {
$content .= '<tr>';
- $current = $version['body'];
+ $current = Studip\Markup::removeHtml($version['body']);
$currentversion = $version['version'];
$diffarray = '<b><font size=-1>'. _("Änderungen zu") . " </font> $zusatz</b><p>";
@@ -1720,6 +1720,7 @@ function do_diff($strlines1,$strlines2)
function toDiffLineArray($lines, $who) {
$dla = [];
+ $lines = Studip\Markup::removeHtml($lines);
$lines = explode("\n",preg_replace("/\r/",'',$lines));
foreach ($lines as $l) {
$dla[] = new DiffLine($l, $who);
--
GitLab