From f6ac3941d59fbb18d5a6432dc03da0f31e7d4b40 Mon Sep 17 00:00:00 2001 From: Denis Chenu Date: Fri, 10 Aug 2012 16:29:10 +0200 Subject: [PATCH] Fixed issue : #6319 Previewgroup can throw error Dev: fixed issue : set $_SESSION['s_lang'] according to existing survey langage (if unique) Dev : before if $langage!= survey['default_langage'] and non other langage, then $_SESSION['s_lang'] is not set --- common_functions.php | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/common_functions.php b/common_functions.php index 75faf069b27..90f52d9a05d 100644 --- a/common_functions.php +++ b/common_functions.php @@ -3051,15 +3051,17 @@ function SetSurveyLanguage($surveyid, $language) $default_language = $row['language']; } - if (!isset($language) || ($language=='') || (isset($additional_languages) && strpos($additional_languages, $language) === false) - or (isset($default_language) && $default_language == $language) - ) { - // Language not supported, or default language for survey, fall back to survey's default language + if (!isset($language) || ($language=='') + || (isset($additional_languages) && strpos($additional_languages, $language) === false) + || (isset($default_language) && $default_language != $language) + ) + { + // Language not supported, fall back to survey's default language $_SESSION['s_lang'] = $default_language; - //echo "Language not supported, resorting to ".$_SESSION['s_lang']."
"; - } else { + } + else + { $_SESSION['s_lang'] = $language; - //echo "Language will be set to ".$_SESSION['s_lang']."
"; } $clang = new limesurvey_lang($_SESSION['s_lang']); }