From 764f5c7a02fbc02d829bad1ffa3d20aaea51095f Mon Sep 17 00:00:00 2001 From: Erik Bernhardson Date: Fri, 8 Jun 2018 14:46:03 -0700 Subject: [PATCH] Resolve required parameter after optional in language Change-Id: I6e0c3b14f1bcea112be7ab694efff5a67622d637 --- languages/Language.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/languages/Language.php b/languages/Language.php index da7bc94b21..321d5f895a 100644 --- a/languages/Language.php +++ b/languages/Language.php @@ -3554,7 +3554,7 @@ class Language { * @return string */ private function truncateInternal( - $string, $length, $ellipsis = '...', $adjustLength = true, $measureLength, $getSubstring + $string, $length, $ellipsis, $adjustLength, $measureLength, $getSubstring ) { if ( !is_callable( $measureLength ) || !is_callable( $getSubstring ) ) { throw new InvalidArgumentException( 'Invalid callback provided' ); @@ -4471,7 +4471,7 @@ class Language { * @throws MWException * @return string $prefix . $mangledCode . $suffix */ - public static function getFileName( $prefix = 'Language', $code, $suffix = '.php' ) { + public static function getFileName( $prefix, $code, $suffix = '.php' ) { if ( !self::isValidBuiltInCode( $code ) ) { throw new MWException( "Invalid language code \"$code\"" ); } -- 2.20.1