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 "Allow search suggestions in skins operating in mobile mode"
[lhc/web/wiklou.git]
/
includes
/
MagicWord.php
diff --git
a/includes/MagicWord.php
b/includes/MagicWord.php
index
391e05a
..
ee95918
100644
(file)
--- a/
includes/MagicWord.php
+++ b/
includes/MagicWord.php
@@
-46,8
+46,8
@@
* $magicWords = [];
*
* $magicWords['en'] = [
* $magicWords = [];
*
* $magicWords['en'] = [
- *
'magicwordkey' => [ 0, 'case_insensitive_magic_word' ],
- *
'magicwordkey2' => [ 1, 'CASE_sensitive_magic_word2' ],
+ * 'magicwordkey' => [ 0, 'case_insensitive_magic_word' ],
+ * 'magicwordkey2' => [ 1, 'CASE_sensitive_magic_word2' ],
* ];
* @endcode
*
* ];
* @endcode
*
@@
-169,6
+169,7
@@
class MagicWord {
'localtimestamp',
'directionmark',
'contentlanguage',
'localtimestamp',
'directionmark',
'contentlanguage',
+ 'pagelanguage',
'numberofadmins',
'cascadingsources',
];
'numberofadmins',
'cascadingsources',
];
@@
-501,7
+502,7
@@
class MagicWord {
# multiple matched parts (variable match); some will be empty because of
# synonyms. The variable will be the second non-empty one so remove any
# blank elements and re-sort the indices.
# multiple matched parts (variable match); some will be empty because of
# synonyms. The variable will be the second non-empty one so remove any
# blank elements and re-sort the indices.
- # See also
bug 6
526
+ # See also
T8
526
$matches = array_values( array_filter( $matches ) );
$matches = array_values( array_filter( $matches ) );
@@
-525,7
+526,7
@@
class MagicWord {
$this->mFound = false;
$text = preg_replace_callback(
$this->getRegex(),
$this->mFound = false;
$text = preg_replace_callback(
$this->getRegex(),
- [
&
$this, 'pregRemoveAndRecord' ],
+ [ $this, 'pregRemoveAndRecord' ],
$text
);
$text
);
@@
-540,7
+541,7
@@
class MagicWord {
$this->mFound = false;
$text = preg_replace_callback(
$this->getRegexStart(),
$this->mFound = false;
$text = preg_replace_callback(
$this->getRegexStart(),
- [
&
$this, 'pregRemoveAndRecord' ],
+ [ $this, 'pregRemoveAndRecord' ],
$text
);
$text
);