X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=languages%2FLanguageConverter.php;h=24b1d0c07662d8ac7a94ba962b5c50fe1de6b8ab;hb=9ea0a461d95180a2eea6fbda0391ac27b4c3e5fc;hp=a84c4b82814fe0651a196dcf7ca5585af7549f50;hpb=2289ab396a60c04c8b7b9d569e17d1c1aa24b28c;p=lhc%2Fweb%2Fwiklou.git diff --git a/languages/LanguageConverter.php b/languages/LanguageConverter.php index a84c4b8281..24b1d0c076 100644 --- a/languages/LanguageConverter.php +++ b/languages/LanguageConverter.php @@ -163,6 +163,8 @@ class LanguageConverter { $req = $this->getURLVariant(); + Hooks::run( 'GetLangPreferredVariant', [ &$req ] ); + if ( $wgUser->isSafeToLoad() && $wgUser->isLoggedIn() && !$req ) { $req = $this->getUserVariant(); } elseif ( !$req ) { @@ -680,9 +682,8 @@ class LanguageConverter { $noScript = '.*?<\/script>(*SKIP)(*FAIL)'; $noStyle = '.*?<\/style>(*SKIP)(*FAIL)'; - // @codingStandardsIgnoreStart Generic.Files.LineLength.TooLong + // phpcs:ignore Generic.Files.LineLength $noHtml = '<(?:[^>=]*+(?>[^>=]*+=\s*+(?:"[^"]*"|\'[^\']*\'|[^\'">\s]*+))*+[^>=]*+>|.*+)(*SKIP)(*FAIL)'; - // @codingStandardsIgnoreEnd while ( $startPos < $length && $continue ) { $continue = preg_match( // Only match -{ outside of html. @@ -769,7 +770,7 @@ class LanguageConverter { $warningDone = true; } $startPos += 2; - continue; + break; } // Recursively parse another rule $inner .= $this->recursiveConvertRule( $text, $variant, $startPos, $depth + 1 );