summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdrian Lang <mail@adrianlang.de>2009-04-15 13:29:52 +0200
committerAdrian Lang <mail@adrianlang.de>2009-04-15 13:29:52 +0200
commit8439477201cd59a6c0dba84ddf48eb86a6154199 (patch)
tree6a8c47ca7d60746aceb3a943c67d2d648c46d305
parente8fc34e75c4c9684b8c7e03d471a905e08446618 (diff)
Add escaping of /.
-rw-r--r--actions/noticesearch.php6
1 files changed, 4 insertions, 2 deletions
diff --git a/actions/noticesearch.php b/actions/noticesearch.php
index 0828e47d7..d996998fc 100644
--- a/actions/noticesearch.php
+++ b/actions/noticesearch.php
@@ -184,11 +184,13 @@ class SearchNoticeListItem extends NoticeListItem {
function highlight($text, $terms)
{
/* Highligh search terms */
- $pattern = '/('.implode('|', array_map('preg_quote', array_map('htmlspecialchars', $terms))).')/i';
+ $options = implode('|', array_map('preg_quote', array_map('htmlspecialchars', $terms),
+ array_fill(0, sizeof($terms), '/')));
+ $pattern = "/($options)/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('preg_quote', array_map('htmlspecialchars', $terms))).')<\/strong>([^"]*")/iU';
+ $pattern = '/(href="[^"]*)<strong>('.$options.')<\/strong>([^"]*")/iU';
do {
$result = preg_replace($pattern, '\\1\\2\\3', $result, -1, $count);
} while ($count);