Fixed issue #9566: Some strings are not from survey language the firs…

…t time
LimeSurvey · May 6, 2015 · ea9f3d7 · ea9f3d7
1 parent c05ff3f
commit ea9f3d7
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/application/helpers/common_helper.php b/application/helpers/common_helper.php
@@ -2358,6 +2358,7 @@ function createTimingsFieldMap($surveyid, $style='full', $force_refresh=false, $
 
     $sLanguage = sanitize_languagecode($sQuestionLanguage);
     $surveyid = sanitize_int($surveyid);
+    $sOldLanguage=App()->language;
     App()->setLanguage($sLanguage);
 
     //checks to see if fieldmap has already been built for this page.
@@ -2387,6 +2388,7 @@ function createTimingsFieldMap($surveyid, $style='full', $force_refresh=false, $
     }
 
     $timingsFieldMap[$surveyid][$style][$sLanguage] = $fieldmap;
+    App()->setLanguage($sOldLanguage);
     return $timingsFieldMap[$surveyid][$style][$sLanguage];
 }