Resolve required parameter after optional in language
authorErik Bernhardson <ebernhardson@wikimedia.org>
Fri, 8 Jun 2018 21:46:03 +0000 (14:46 -0700)
committerEBernhardson <ebernhardson@wikimedia.org>
Fri, 8 Jun 2018 21:48:24 +0000 (21:48 +0000)
Change-Id: I6e0c3b14f1bcea112be7ab694efff5a67622d637

languages/Language.php

index da7bc94..321d5f8 100644 (file)
@@ -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\"" );
                }