Merge "Avoid fatal errors with uselang=s"

diff --git a/languages/Language.php b/languages/Language.php
index dd8a314..8aaaec0 100644 (file)
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -357,7 +357,7 @@ class Language {
                        throw new MWException( __METHOD__ . " must be passed a string, $type given$addmsg" );
                }
 
-               return (bool)preg_match( '/^[a-z0-9-]+$/i', $code );
+               return (bool)preg_match( '/^[a-z0-9-]{2,}$/i', $code );
        }
 
        /**