diff --git a/module/action/model.php b/module/action/model.php index 875c304cf7..6110f54b6f 100755 --- a/module/action/model.php +++ b/module/action/model.php @@ -894,7 +894,7 @@ class actionModel extends model * @access public * @return void */ - public function printChanges($objectType, $histories) + public function printChanges($objectType, $histories, $canChangeTag = true) { if(empty($histories)) return; @@ -921,7 +921,7 @@ class actionModel extends model $history->diff = ($history->field != 'subversion' and $history->field != 'git') ? htmlspecialchars($history->diff) : $history->diff; // Keep the diff link. $history->diff = str_replace(array('[ins]', '[/ins]', '[del]', '[/del]'), array('', '', '', ''), $history->diff); $history->diff = nl2br($history->diff); - $history->noTagDiff = preg_replace('/<\/?([a-z][a-z0-9]*)[^\/]*\/?>/Ui', '', $history->diff); + $history->noTagDiff = $canChangeTag ? preg_replace('/<\/?([a-z][a-z0-9]*)[^\/]*\/?>/Ui', '', $history->diff) : ''; printf($this->lang->action->desc->diff2, $history->fieldLabel, $history->noTagDiff, $history->diff); } else diff --git a/module/common/view/mail.footer.html.php b/module/common/view/mail.footer.html.php index fac19fbba5..f7cd1569bf 100644 --- a/module/common/view/mail.footer.html.php +++ b/module/common/view/mail.footer.html.php @@ -27,7 +27,7 @@ if(file_exists($extViewFile)) history)):?> -
action->printChanges($action->objectType, $action->history);?>
+
action->printChanges($action->objectType, $action->history, false);?>