From: Niklas Laxström <niklas.laxstrom@gmail.com>
Date: Wed, 3 Apr 2013 10:35:29 +0000 (+0000)
Subject: Avoid fatal errors with uselang=s
X-Git-Tag: 1.31.0-rc.0~20077^2
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/categories/modifier.php?a=commitdiff_plain;h=022aa97b207cd68022d76a27f74c697c523b5834;p=lhc%2Fweb%2Fwiklou.git

Avoid fatal errors with uselang=s

languages is not a subclass of Language

Force valid built-in language codes to be at least two letters long.

Bug: 46710
Change-Id: Ife8885ed4bdb3a017a54e063f5dc58468ba231d5
---

diff --git a/languages/Language.php b/languages/Language.php
index 57d456a6d7..156f7b0124 100644
--- 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 );
 	}
 
 	/**