Fixed issue : #6319 Previewgroup can throw error

Dev: fixed issue : set $_SESSION['s_lang'] according to existing survey langage (if unique) Dev : not sure we use function SetSurveyLanguage
LimeSurvey · Aug 10, 2012 · 3aeb418 · 3aeb418
1 parent afbed20
commit 3aeb418
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/application/helpers/frontend_helper.php b/application/helpers/frontend_helper.php
@@ -2835,15 +2835,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['survey_'.$surveyid]['s_lang'] = $default_language;
-            //echo "Language not supported, resorting to ".$_SESSION['s_lang']."<br />";
-        } else {
+        }
+        else
+        {
             $_SESSION['survey_'.$surveyid]['s_lang'] =  $language;
-            //echo "Language will be set to ".$_SESSION['s_lang']."<br />";
         }
         Yii::import('application.libraries.Limesurvey_lang', true);
         $clang = new limesurvey_lang($_SESSION['survey_'.$surveyid]['s_lang']);