holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Strip HTML before diffing for history

Browse Source
This commit is contained in:
nathangray 2019-06-06 15:05:31 -06:00
parent 047af47b81
commit 8edb92f03f
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
api/src/Storage/Tracking.php
View File

@ -463,7 +463,18 @@ abstract class Tracking
$this->historylog->needs_diff ($name, $data[$name]) || $this->historylog->needs_diff ($name, $old[$name]))) $this->historylog->needs_diff ($name, $data[$name]) || $this->historylog->needs_diff ($name, $old[$name])))
{ {
// Multiline string, just store diff // Multiline string, just store diff
$diff = new \Horde_Text_Diff('auto', array(explode("\n",$old[$name]), explode("\n",$data[$name]))); // Strip HTML first though
$old_text = Api\Mail\Html::convertHTMLToText($old[$name]);
$new_text = Api\Mail\Html::convertHTMLToText($data[$name]);
// If only change was something in HTML, show the HTML
if(trim($old_text) === trim($new_text))
{
$old_text = $old[$name];
$new_text = $data[$name];
}
$diff = new \Horde_Text_Diff('auto', array(explode("\n",$old_text), explode("\n",$new_text)));
$renderer = new \Horde_Text_Diff_Renderer_Unified(); $renderer = new \Horde_Text_Diff_Renderer_Unified();
$this->historylog->add( $this->historylog->add(
$status, $status,