| @@ -934,12 +934,10 @@ | ||
| 934 | 934 | } |
| 935 | 935 | |
| 936 | 936 | if (!empty($cmsUserLanguage)) { |
| 937 | 937 | $user->language = $cmsUserLanguage; |
| 938 | - } elseif (acym_isMultilingual()) { | |
| 939 | - // Take the configuration's language | |
| 940 | - $configUserLanguage = $this->config->get('multilingual_user_default', 'current_language'); | |
| 941 | - $user->language = $configUserLanguage === 'current_language' ? acym_getLanguageTag() : $configUserLanguage; | |
| 938 | + } else { | |
| 939 | + $user->language = acym_getDefaultUserLanguage(); | |
| 942 | 940 | } |
| 943 | 941 | } |
| 944 | 942 | |
| 945 | 943 | $currentUserid = acym_currentUserId(); |
