Dev Added gid to answers tab in Survey translation

git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey_dev@9332 b72ed6b6-b9f8-46b5-92b4-906544132732
LimeSurvey · Oct 25, 2010 · d752729 · d752729
1 parent 252b8ab
commit d752729
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 19 deletions.
diff --git a/admin/translate.php b/admin/translate.php
@@ -45,10 +45,9 @@
   }
 
   $actionvalue = "";
-  if(isset($_POST['actionvalue']))
-  {
-    $actionvalue = $_POST['actionvalue'];
-  }
+  if(isset($_POST['actionvalue'])) {$actionvalue = $_POST['actionvalue'];}
+  if(isset($_GET['actionvalue'])) {$actionvalue = $_GET['actionvalue'];}
+
 
   $survey_title = $surveyinfo['name'];
   $baselang = GetBaseLanguageFromSurveyID($surveyid);

diff --git a/admin/translate_functions.php b/admin/translate_functions.php
@@ -390,29 +390,30 @@ function setupTranslateFields($type)
 
     case 'answer':
       $transarray = array(
-        "querybase" => "SELECT {$dbprefix}answers.* "
-                                     ."FROM {$dbprefix}answers,{$dbprefix}questions "
-                                    ."WHERE {$dbprefix}questions.sid =' $surveyid' "
-                                      ."AND {$dbprefix}questions.qid = {$dbprefix}answers.qid "
-                                      ."AND {$dbprefix}questions.language = {$dbprefix}answers.language "
-                                      ."AND {$dbprefix}questions.language='{$baselang}' "
-                                    ."ORDER BY qid,code,sortorder" ,
-        "queryto" => "SELECT {$dbprefix}answers.* "
-                                   ."FROM {$dbprefix}answers,{$dbprefix}questions "
-                                  ."WHERE {$dbprefix}questions.sid =' $surveyid' "
-                                    ."AND {$dbprefix}questions.qid = {$dbprefix}answers.qid "
-                                    ."AND {$dbprefix}questions.language = {$dbprefix}answers.language "
-                                    ."AND {$dbprefix}questions.language=".db_quoteall($tolang)
+//        "querybase" => "SELECT {$dbprefix}answers.* "
+        "querybase" => "SELECT".db_table_name('answers').".*, ".db_table_name('questions').".gid "
+                                     ." FROM ".db_table_name('answers').", ".db_table_name('questions')
+                                    ." WHERE ".db_table_name('questions').".sid ='{$surveyid}' "
+                                      ." AND ".db_table_name('questions').".qid = ".db_table_name('answers').".qid "
+                                      ." AND ".db_table_name('questions').".language = ".db_table_name('answers').".language "
+                                      ." AND ".db_table_name('questions').".language='{$baselang}' "
+                                    ." ORDER BY qid,code,sortorder" ,
+        "queryto" => "SELECT".db_table_name('answers').".*, ".db_table_name('questions').".gid "
+                                     ." FROM ".db_table_name('answers').", ".db_table_name('questions')
+                                    ." WHERE ".db_table_name('questions').".sid ='{$surveyid}' "
+                                      ." AND ".db_table_name('questions').".qid = ".db_table_name('answers').".qid "
+                                      ." AND ".db_table_name('questions').".language = ".db_table_name('answers').".language "
+                                      ." AND ".db_table_name('questions').".language=".db_quoteall($tolang)
                                   ."ORDER BY qid,code,sortorder" ,
-        "queryupdate" => "UPDATE {$dbprefix}answers "
+        "queryupdate" => "UPDATE ".db_table_name('answers')
                          ."SET answer = ".db_quoteall($new)
                          ."WHERE qid = '{$id1}' "
                            ."AND code='{$id2}' "
                            ."AND language='{$tolang}' LIMIT 1",
         "what" => 'answer',
         "id1"  => 'qid',
         "id2"  => 'code',
-        "gid"  => FALSE,
+        "gid"  => TRUE,
         "qid"  => TRUE,
         "desc" => "Subquestions",
         "formname" => 'answers_update'