diff --git a/actions/noticesearch.php b/actions/noticesearch.php
index eb33827799..29527c5672 100644
--- a/actions/noticesearch.php
+++ b/actions/noticesearch.php
@@ -139,8 +139,15 @@ class NoticesearchAction extends SearchAction {
}
function highlight($text, $terms) {
+ /* Highligh serach terms */
$pattern = '/('.implode('|',array_map('htmlspecialchars', $terms)).')/i';
$result = preg_replace($pattern, '\\1', $text);
+
+ /* Remove highlighting from inside links, loop incase multiple highlights in links */
+ $pattern = '/(href="[^"]*)('.implode('|',array_map('htmlspecialchars', $terms)).')<\/strong>([^"]*")/iU';
+ do {
+ $result = preg_replace($pattern, '\\1\\2\\3', $result, -1, $count);
+ } while ($count);
return $result;
}
}