summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Cochrane <mikec@mikenz.geek.nz>2008-07-19 23:34:01 -0400
committerMike Cochrane <mikec@mikenz.geek.nz>2008-07-19 23:34:01 -0400
commit58ae93a621b1e5379f61cbfd5af1d7ac49b7dc15 (patch)
treeef81bb941f6fa7757ca25429aa0b2dac072916d9
parenta1515e5411eaed5e21bf56536438bc906d197d35 (diff)
Don't highlight search terms inside url
darcs-hash:20080720033401-533db-05bf2c9ebe988ebda6a295447a958af66571a088.gz
-rw-r--r--actions/noticesearch.php7
1 files changed, 7 insertions, 0 deletions
diff --git a/actions/noticesearch.php b/actions/noticesearch.php
index eb3382779..29527c567 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, '<strong>\\1</strong>', $text);
+
+ /* Remove highlighting from inside links, loop incase multiple highlights in links */
+ $pattern = '/(href="[^"]*)<strong>('.implode('|',array_map('htmlspecialchars', $terms)).')<\/strong>([^"]*")/iU';
+ do {
+ $result = preg_replace($pattern, '\\1\\2\\3', $result, -1, $count);
+ } while ($count);
return $result;
}
}