From b08181ee95ed275dd06c9af4fc17292ed65df240 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a?= <marcosgdf@gmail.com>
Date: Fri, 3 Aug 2012 23:11:51 +0200
Subject: [PATCH] Removed $codelang test

---
 htdocs/core/lib/functions.lib.php | 41 ++++++++++++++-----------------
 1 file changed, 18 insertions(+), 23 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 4b90f3a2a32..c52efec205e 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3865,32 +3865,27 @@ function picto_from_langcode($codelang)
 {
 	global $langs;
 
-	if (!$codelang)
+	if ($codelang == 'auto')
 	{
-		if ($codelang == 'auto')
-		{
-			return img_picto_common($langs->trans('AutoDetectLang'), 'flags/int.png');
-		}
-
-		$langtocountryflag = array(
-			'ar_AR' => '',
-			'ca_ES' => 'catalonia',
-			'da_DA' => 'dk',
-			'fr_CA' => 'mq',
-			'sv_SV' => 'se'
-		);
-
-		if (isset($langtocountryflag[$codelang])) $flagImage = $langtocountryflag[$codelang];
-		else
-		{
-			$tmparray = explode('_', $codelang);
-			$flagImage = empty($tmparray[1]) ? $tmparray[0] : $tmparray[1];
-		}
-
-		return img_picto_common($codelang, 'flags/'.strtolower($flagImage).'.png');
+		return img_picto_common($langs->trans('AutoDetectLang'), 'flags/int.png');
 	}
 
-	return '';
+	$langtocountryflag = array(
+		'ar_AR' => '',
+		'ca_ES' => 'catalonia',
+		'da_DA' => 'dk',
+		'fr_CA' => 'mq',
+		'sv_SV' => 'se'
+	);
+
+	if (isset($langtocountryflag[$codelang])) $flagImage = $langtocountryflag[$codelang];
+	else
+	{
+		$tmparray = explode('_', $codelang);
+		$flagImage = empty($tmparray[1]) ? $tmparray[0] : $tmparray[1];
+	}
+
+	return img_picto_common($codelang, 'flags/'.strtolower($flagImage).'.png');
 }
 
 /**