From: Fomafix <fomafix@googlemail.com>
Date: Tue, 26 Jun 2018 07:30:39 +0000 (+0200)
Subject: Site: Explicit allow setLanguageCode( null )
X-Git-Tag: 1.34.0-rc.0~2532^2
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/banques/?a=commitdiff_plain;h=43b03675d7562872b61b88949f6f4b89cb5026cd;p=lhc%2Fweb%2Fwiklou.git

Site: Explicit allow setLanguageCode( null )

$site->setLanguageCode( null ) is already used in
DBSiteStore::loadSites and this worked because
Language::isValidCode( null ) === true.

This change explicit check for null and allow to set null without
depending on Language::isValidCode( null ) === true.

Change-Id: I0c9fe03cbf1434b0340e61e96360c0aaeb0fe89d
---

diff --git a/includes/site/Site.php b/includes/site/Site.php
index 01b2a3c491..ec1376564e 100644
--- a/includes/site/Site.php
+++ b/includes/site/Site.php
@@ -460,10 +460,10 @@ class Site implements Serializable {
 	 *
 	 * @since 1.21
 	 *
-	 * @param string $languageCode
+	 * @param string|null $languageCode
 	 */
 	public function setLanguageCode( $languageCode ) {
-		if ( !Language::isValidCode( $languageCode ) ) {
+		if ( $languageCode !== null && !Language::isValidCode( $languageCode ) ) {
 			throw new InvalidArgumentException( "$languageCode is not a valid language code." );
 		}
 		$this->languageCode = $languageCode;