dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "maintenance: Script to rename titles for Unicode uppercasing changes"
[lhc/web/wiklou.git]
/
includes
/
search
/
SearchHighlighter.php
diff --git
a/includes/search/SearchHighlighter.php
b/includes/search/SearchHighlighter.php
index
5dfc4df
..
6c01f79
100644
(file)
--- a/
includes/search/SearchHighlighter.php
+++ b/
includes/search/SearchHighlighter.php
@@
-44,7
+44,7
@@
class SearchHighlighter {
* Wikitext highlighting when $wgAdvancedSearchHighlighting = true
*
* @param string $text
* Wikitext highlighting when $wgAdvancedSearchHighlighting = true
*
* @param string $text
- * @param
array
$terms Terms to highlight (not html escaped but
+ * @param
string[]
$terms Terms to highlight (not html escaped but
* regex escaped via SearchDatabase::regexTerm())
* @param int $contextlines
* @param int $contextchars
* regex escaped via SearchDatabase::regexTerm())
* @param int $contextlines
* @param int $contextchars
@@
-502,7
+502,7
@@
class SearchHighlighter {
* Used when $wgAdvancedSearchHighlighting is false.
*
* @param string $text
* Used when $wgAdvancedSearchHighlighting is false.
*
* @param string $text
- * @param
array
$terms Escaped for regex by SearchDatabase::regexTerm()
+ * @param
string[]
$terms Escaped for regex by SearchDatabase::regexTerm()
* @param int $contextlines
* @param int $contextchars
* @return string
* @param int $contextlines
* @param int $contextchars
* @return string
@@
-519,7
+519,7
@@
class SearchHighlighter {
$extract = "";
$contLang = MediaWikiServices::getInstance()->getContentLanguage();
foreach ( $lines as $line ) {
$extract = "";
$contLang = MediaWikiServices::getInstance()->getContentLanguage();
foreach ( $lines as $line ) {
- if (
0 == $contextlines
) {
+ if (
$contextlines == 0
) {
break;
}
++$lineno;
break;
}
++$lineno;