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 "Add .pipeline/ with dev image variant"
[lhc/web/wiklou.git]
/
includes
/
search
/
SearchHighlighter.php
diff --git
a/includes/search/SearchHighlighter.php
b/includes/search/SearchHighlighter.php
index
6c01f79
..
8f0db44
100644
(file)
--- a/
includes/search/SearchHighlighter.php
+++ b/
includes/search/SearchHighlighter.php
@@
-29,6
+29,9
@@
use MediaWiki\MediaWikiServices;
* @ingroup Search
*/
class SearchHighlighter {
* @ingroup Search
*/
class SearchHighlighter {
+ const DEFAULT_CONTEXT_LINES = 2;
+ const DEFAULT_CONTEXT_CHARS = 75;
+
protected $mCleanWikitext = true;
/**
protected $mCleanWikitext = true;
/**
@@
-50,7
+53,12
@@
class SearchHighlighter {
* @param int $contextchars
* @return string
*/
* @param int $contextchars
* @return string
*/
- public function highlightText( $text, $terms, $contextlines, $contextchars ) {
+ public function highlightText(
+ $text,
+ $terms,
+ $contextlines = self::DEFAULT_CONTEXT_LINES,
+ $contextchars = self::DEFAULT_CONTEXT_CHARS
+ ) {
global $wgSearchHighlightBoundaries;
if ( $text == '' ) {
global $wgSearchHighlightBoundaries;
if ( $text == '' ) {
@@
-66,8
+74,8
@@
class SearchHighlighter {
3 => "/(\n\\{\\|)|(\n\\|\\})/" ]; // table
// @todo FIXME: This should prolly be a hook or something
3 => "/(\n\\{\\|)|(\n\\|\\})/" ]; // table
// @todo FIXME: This should prolly be a hook or something
- // instead of hardcoding
a class name from
the Cite extension
- if (
class_exists
( 'Cite' ) ) {
+ // instead of hardcoding
the name of
the Cite extension
+ if (
\ExtensionRegistry::getInstance()->isLoaded
( 'Cite' ) ) {
$spat .= '|(<ref>)'; // references via cite extension
$endPatterns[4] = '/(<ref>)|(<\/ref>)/';
}
$spat .= '|(<ref>)'; // references via cite extension
$endPatterns[4] = '/(<ref>)|(<\/ref>)/';
}
@@
-507,7
+515,12
@@
class SearchHighlighter {
* @param int $contextchars
* @return string
*/
* @param int $contextchars
* @return string
*/
- public function highlightSimple( $text, $terms, $contextlines, $contextchars ) {
+ public function highlightSimple(
+ $text,
+ $terms,
+ $contextlines = self::DEFAULT_CONTEXT_LINES,
+ $contextchars = self::DEFAULT_CONTEXT_CHARS
+ ) {
$lines = explode( "\n", $text );
$terms = implode( '|', $terms );
$lines = explode( "\n", $text );
$terms = implode( '|', $terms );
@@
-557,7
+570,11
@@
class SearchHighlighter {
* @param int $contextchars Average number of characters per line
* @return string
*/
* @param int $contextchars Average number of characters per line
* @return string
*/
- public function highlightNone( $text, $contextlines, $contextchars ) {
+ public function highlightNone(
+ $text,
+ $contextlines = self::DEFAULT_CONTEXT_LINES,
+ $contextchars = self::DEFAULT_CONTEXT_CHARS
+ ) {
$match = [];
$text = ltrim( $text ) . "\n"; // make sure the preg_match may find the last line
$text = str_replace( "\n\n", "\n", $text ); // remove empty lines
$match = [];
$text = ltrim( $text ) . "\n"; // make sure the preg_match may find the last line
$text = str_replace( "\n\n", "\n", $text ); // remove empty lines