X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fnoticesearch.php;h=29527c56725c721486b2d234bf2b4c108fac2826;hb=912e9b3f4ff3e43838e44e9ab804765e9573206f;hp=ab383fab436152cdb42f3f37a40275f9b0ede2d3;hpb=8b32942658b179010315450a62b473631a501399;p=quix0rs-gnu-social.git

diff --git a/actions/noticesearch.php b/actions/noticesearch.php
index ab383fab43..29527c5672 100644
--- a/actions/noticesearch.php
+++ b/actions/noticesearch.php
@@ -20,15 +20,14 @@
 if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/searchaction.php');
-define(NOTICES_PER_PAGE, 20);
+define('NOTICES_PER_PAGE', 20);
 
 # XXX common parent for people and content search?
 
 class NoticesearchAction extends SearchAction {
 
 	function get_instructions() {
-		return _('Search for notices on %%site.name%% by their contents. ' .
-				  'Separate search terms by spaces; they must be 3 characters or more.');
+		return _('Search for notices on %%site.name%% by their contents. Separate search terms by spaces; they must be 3 characters or more.');
 	}
 
 	function get_title() {
@@ -140,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;
 	}
 }