clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #13732 from annando/issue-13731 

Issue 13731: Fix error concerning invalid user
This commit is contained in:
Hypolite Petovan 2023-12-17 21:16:28 -05:00 committed by GitHub
parent 02dded6caa 7c7ebd9b86
commit 47b0302811
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Model/User.php
View File

@ -567,10 +567,12 @@ class User
*/ */
public static function getLanguageCode(int $uid): string public static function getLanguageCode(int $uid): string
{ {
$owner = self::getOwnerDataById($uid); $owner = self::getOwnerDataById($uid);
$language = DI::l10n()->toISO6391($owner['language']); if (!empty($owner['language'])) {
if (in_array($language, array_keys(DI::l10n()->getLanguageCodes()))) { $language = DI::l10n()->toISO6391($owner['language']);
return $language; if (in_array($language, array_keys(DI::l10n()->getLanguageCodes()))) {
return $language;
}
} }
return DI::l10n()->toISO6391(DI::config()->get('system', 'language')); return DI::l10n()->toISO6391(DI::config()->get('system', 'language'));
} }