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
Accept BCP 47 codes as aliases for nonstandard variants
[lhc/web/wiklou.git]
/
includes
/
MagicWord.php
diff --git
a/includes/MagicWord.php
b/includes/MagicWord.php
index
93c8a71
..
9cef700
100644
(file)
--- a/
includes/MagicWord.php
+++ b/
includes/MagicWord.php
@@
-257,7
+257,7
@@
class MagicWord {
*
* Use factory instead: MagicWord::get
*
*
* Use factory instead: MagicWord::get
*
- * @param string $id The internal name of the magic word
+ * @param string
|null
$id The internal name of the magic word
* @param string[]|string $syn synonyms for the magic word
* @param bool $cs If magic word is case sensitive
*/
* @param string[]|string $syn synonyms for the magic word
* @param bool $cs If magic word is case sensitive
*/
@@
-395,13
+395,7
@@
class MagicWord {
public function compareStringLength( $s1, $s2 ) {
$l1 = strlen( $s1 );
$l2 = strlen( $s2 );
public function compareStringLength( $s1, $s2 ) {
$l1 = strlen( $s1 );
$l2 = strlen( $s2 );
- if ( $l1 < $l2 ) {
- return 1;
- } elseif ( $l1 > $l2 ) {
- return -1;
- } else {
- return 0;
- }
+ return $l2 <=> $l1; // descending
}
/**
}
/**