From cb9713074daeb9e0e49737d3b8d2663bf5f094e9 Mon Sep 17 00:00:00 2001 From: David Siegfried <david.siegfried@uni-vechta.de> Date: Wed, 12 Jul 2023 06:16:38 +0000 Subject: [PATCH] prevent php8-warnings, closes #2834 Closes #2834 Merge request studip/studip!1918 --- lib/language.inc.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/language.inc.php b/lib/language.inc.php index a56fbe97f0b..921efc0f54a 100644 --- a/lib/language.inc.php +++ b/lib/language.inc.php @@ -95,7 +95,7 @@ function get_accepted_languages(Psr\Http\Message\RequestInterface $request = nul */ function init_i18n($_language) { global $_language_domain, $INSTALLED_LANGUAGES; - + $_language_path = null; if (isset($_language_domain) && isset($_language)) { $_language_path = $INSTALLED_LANGUAGES[$_language]["path"]; setLocaleEnv($_language, $_language_domain); @@ -118,9 +118,7 @@ function getUserLanguage($uid) $query = "SELECT preferred_language FROM user_info WHERE user_id = ?"; $statement = DBManager::get()->prepare($query); $statement->execute([$uid]); - $language = $statement->fetchColumn() ?: Config::get()->DEFAULT_LANGUAGE; - - return $language; + return $statement->fetchColumn() ?: Config::get()->DEFAULT_LANGUAGE; } /** -- GitLab