Only iso code of country is shown in profile #314

Author: Fasse

adm_program/system/classes/profilefields.php

@@ -323,47 +323,51 @@ public function getValue($fieldNameIntern, $format = '')
 
             if($format !== 'database')
             {
-                switch ($this->mProfileFields[$fieldNameIntern]->getValue('usf_type'))
+                if($fieldNameIntern == 'COUNTRY')
                 {
-                    case 'DATE':
-                        if ($value !== '')
-                        {
-                            // if no format or html is set then show date format from Admidio settings
-                            if($format === '' || $format === 'html')
+                    if ($value !== '')
+                    {
+                        // read the language name of the country
+                        $value = $gL10n->getCountryByCode($value);
+                    }
+                }
+                else
+                {
+                    switch ($this->mProfileFields[$fieldNameIntern]->getValue('usf_type'))
+                    {
+                        case 'DATE':
+                            if ($value !== '')
                             {
-                                $dateFormat = $gPreferences['system_date'];
+                                // if no format or html is set then show date format from Admidio settings
+                                if($format === '' || $format === 'html')
+                                {
+                                    $dateFormat = $gPreferences['system_date'];
+                                }
+                                else
+                                {
+                                    $dateFormat = $format;
+                                }
+
+                                // if date field then the current date format must be used
+                                $date = new DateTimeExtended($value, 'Y-m-d');
+                                if(!$date->isValid())
+                                {
+                                    return $value;
+                                }
+                                $value = $date->format($dateFormat);
                             }
-                            else
+                            break;
+                        case 'DROPDOWN':
+                        case 'RADIO_BUTTON':
+                            // the value in db is only the position, now search for the text
+                            if($value > 0 && $format !== 'html')
                             {
-                                $dateFormat = $format;
-                            }
+                                $arrListValues = $this->mProfileFields[$fieldNameIntern]->getValue('usf_value_list');
+                                $value = $arrListValues[$value];
 
-                            // if date field then the current date format must be used
-                            $date = new DateTimeExtended($value, 'Y-m-d');
-                            if(!$date->isValid())
-                            {
-                                return $value;
                             }
-                            $value = $date->format($dateFormat);
-                        }
-                        break;
-                    case 'DROPDOWN':
-                    case 'RADIO_BUTTON':
-                        // the value in db is only the position, now search for the text
-                        if($value > 0 && $format !== 'html')
-                        {
-                            $arrListValues = $this->mProfileFields[$fieldNameIntern]->getValue('usf_value_list');
-                            $value = $arrListValues[$value];
-
-                        }
-                        break;
-                    case 'COUNTRY':
-                        if ($value !== '')
-                        {
-                            // read the language name of the country
-                            $value = $gL10n->getCountryByCode($value);
-                        }
-                        break;
+                            break;
+                    }
                 }
             }
         }