Fixed issue #7737: Login in survey-frontend does not regard language

LimeSurvey · Apr 24, 2013 · 6bf206e · 6bf206e
1 parent f3e8ece
commit 6bf206e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/application/controllers/admin/tokens.php b/application/controllers/admin/tokens.php
@@ -466,7 +466,7 @@ function getTokens_json($iSurveyId, $search = null)
             }
             // Check if the token can be taken
             if ($token['token'] != "" && ($token['completed'] == "N" || $token['completed'] == "") && hasSurveyPermission($iSurveyId, 'responses', 'create')) {
-                $action .= viewHelper::getImageLink('do_16.png', "survey/index/sid/{$iSurveyId}/token/{$token['token']}/newtest/Y", $clang->gT("Do survey"), '_blank');
+                $action .= viewHelper::getImageLink('do_16.png', "survey/index/sid/{$iSurveyId}/token/{$token['token']}/lang/{$token['language']}/newtest/Y", $clang->gT("Do survey"), '_blank');
             } else {
                 $action .= '<div style="width: 20px; height: 16px; float: left;"></div>';
             }

diff --git a/application/helpers/frontend_helper.php b/application/helpers/frontend_helper.php
@@ -1274,7 +1274,7 @@ function buildsurveysession($surveyid,$preview=false)
         $thissurvey = getSurveyInfo($surveyid);
         if (empty($templang))
         {
-            $templang=$thissurvey['language'];
+            $templang=$clang->langcode;
         }
 
         $_SESSION['survey_'.$surveyid]['templatename']=validateTemplateDir($thissurvey['template']);