Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Allow 'all:' on all wikis in addition to 'searchall' translation

Browse source 
This allows to have a common syntax useable everywhere.

Bug: T165110
Change-Id: If71fe5df045fb754925946088f8f793197bc8301
This commit is contained in:
David Causse 2018-05-11 15:04:49 +02:00
parent 390ff7fca1
commit 39cbbab021
1 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
includes/search/SearchEngine.php
View file

@ -335,12 +335,25 @@ abstract class SearchEngine {
return false;
}
$extractedNamespace = null;
$allkeywords = [];
$allkeyword = wfMessage( 'searchall' )->inContentLanguage()->text() . ":";
if ( strncmp( $query, $allkeyword, strlen( $allkeyword ) ) == 0 ) {
$extractedNamespace = null;
$parsed = substr( $query, strlen( $allkeyword ) );
} elseif ( strpos( $query, ':' ) !== false ) {
$allkeywords[] = wfMessage( 'searchall' )->inContentLanguage()->text() . ":";
// force all: so that we have a common syntax for all the wikis
if ( !in_array( 'all:', $allkeywords ) ) {
$allkeywords[] = 'all:';
}
$allQuery = false;
foreach ( $allkeywords as $kw ) {
if ( strncmp( $query, $kw, strlen( $kw ) ) == 0 ) {
$extractedNamespace = null;
$parsed = substr( $query, strlen( $kw ) );
$allQuery = true;
break;
}
}
if ( !$allQuery && strpos( $query, ':' ) !== false ) {
// TODO: should we unify with PrefixSearch::extractNamespace ?
$prefix = str_replace( ' ', '_', substr( $query, 0, strpos( $query, ':' ) ) );
$index = $wgContLang->getNsIndex( $prefix );