Merge "Change job table params from blob to mediumblob"

[lhc/web/wiklou.git] / languages / Language.php

diff --git a/languages/Language.php b/languages/Language.php
index 5ac2882..71d350f 100644 (file)
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -386,6 +386,7 @@ class Language {
         */
        public static function isValidCode( $code ) {
                static $cache = [];
+               Assert::parameterType( 'string', $code, '$code' );
                if ( !isset( $cache[$code] ) ) {
                        // People think language codes are html safe, so enforce it.
                        // Ideally we should only allow a-zA-Z0-9-
@@ -2837,11 +2838,14 @@ class Language {
        }
 
        /**
+        * TODO: $s is not always a string per T218883
         * @param string $s
         * @return string
         */
        function checkTitleEncoding( $s ) {
-               Assert::parameterType( 'string', $s, '$s' );
+               if ( is_array( $s ) ) {
+                       throw new MWException( 'Given array to checkTitleEncoding.' );
+               }
                if ( StringUtils::isUtf8( $s ) ) {
                        return $s;
                }
@@ -3511,8 +3515,8 @@ class Language {
         * Truncate a string to a specified number of characters, appending an optional
         * string (e.g. for ellipsis).
         *
-        * This provides multibyte version of truncate() method of this class, suitable for truncation
-        * based on number of characters, instead of number of bytes.
+        * This provides multibyte version of truncateForDatabase() method of this class,
+        * suitable for truncation based on number of characters, instead of number of bytes.
         *
         * If $length is negative, the string will be truncated from the beginning.
         *