extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 06:30:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

check if $name is already a country-code, before attempting to find a matching one, which can fail in certain areas of setup

Browse Source
This commit is contained in:
Ralf Becker 2012-01-05 21:58:28 +00:00
parent 89f46c6a3b
commit 19dcc2e654
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
phpgwapi/inc/class.country.inc.php
View File

@ -387,6 +387,11 @@ class country
{
if (!$name) return ''; // nothing to do
if (strlen($name) == 2 && isset($this->country_array[$name]))
{
return $name; // $name is already a country-code
}
if (($code = array_search(strtoupper($name),$this->country_array)) !== false)
{
return $code;