From b6caeb6c179bab82a4054e426cb2f2e387154ea7 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 3 Aug 2015 10:53:51 +0200
Subject: [PATCH] monitoring: Use createTicketLinks helper when showing
 comments of an object

refs #9611
---
 .../views/scripts/show/components/comments.phtml     | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/show/components/comments.phtml b/modules/monitoring/application/views/scripts/show/components/comments.phtml
index ded9d3836..3db9de338 100644
--- a/modules/monitoring/application/views/scripts/show/components/comments.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/comments.phtml
@@ -52,16 +52,8 @@ if (empty($object->comments) && ! $addLink) {
  <?php foreach ($object->comments as $comment): ?>
  <?php
 
-// Ticket hook sample
-$commentText = $this->tickets ? preg_replace_callback(
-    $this->tickets->getPattern(),
-    array($this->tickets, 'createLink'),
-    $this->escape($comment->comment)
-) : $this->escape($comment->comment);
-
-
 // Form is unset if the current user lacks the respective permission
-if (isset($delCommentForm)) { 
+if (isset($delCommentForm)) {
     $deleteButton = clone($delCommentForm);
     $deleteButton->populate(
         array(
@@ -80,7 +72,7 @@ if (isset($delCommentForm)) {
 		    	<?= $this->timeAgo($comment->timestamp) ?>
                 <?= $deleteButton ?>
 		    </h3>
-		    <p><span class="sr-only">(<?= $this->translate('Comment'); ?>): </span><?= str_replace(array('\r\n', '\n'), '<br>', $commentText) ?></p>
+		    <p><span class="sr-only">(<?= $this->translate('Comment'); ?>): </span><?= str_replace(array('\r\n', '\n'), '<br>', $this->createTicketLinks($comment->comment)) ?></p>
          </li>
  <?php endforeach ?>
     </ul>