Skip to content
Snippets Groups Projects
Commit e7def943 authored by David Siegfried's avatar David Siegfried Committed by Jan-Hendrik Willms
Browse files

prevent php8-warnings, closes #2834

Closes #2834

Merge request studip/studip!1918
parent ab252e76
No related branches found
No related tags found
No related merge requests found
...@@ -95,7 +95,7 @@ function get_accepted_languages(Psr\Http\Message\RequestInterface $request = nul ...@@ -95,7 +95,7 @@ function get_accepted_languages(Psr\Http\Message\RequestInterface $request = nul
*/ */
function init_i18n($_language) { function init_i18n($_language) {
global $_language_domain, $INSTALLED_LANGUAGES; global $_language_domain, $INSTALLED_LANGUAGES;
$_language_path = null;
if (isset($_language_domain) && isset($_language)) { if (isset($_language_domain) && isset($_language)) {
$_language_path = $INSTALLED_LANGUAGES[$_language]["path"]; $_language_path = $INSTALLED_LANGUAGES[$_language]["path"];
setLocaleEnv($_language, $_language_domain); setLocaleEnv($_language, $_language_domain);
...@@ -118,9 +118,7 @@ function getUserLanguage($uid) ...@@ -118,9 +118,7 @@ function getUserLanguage($uid)
$query = "SELECT preferred_language FROM user_info WHERE user_id = ?"; $query = "SELECT preferred_language FROM user_info WHERE user_id = ?";
$statement = DBManager::get()->prepare($query); $statement = DBManager::get()->prepare($query);
$statement->execute([$uid]); $statement->execute([$uid]);
$language = $statement->fetchColumn() ?: Config::get()->DEFAULT_LANGUAGE; return $statement->fetchColumn() ?: Config::get()->DEFAULT_LANGUAGE;
return $language;
} }
/** /**
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment