Fixed issue #4050: Problem with Array (flexible labels) dual scale in…

… data entry mode using a multi language labelset git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey@8257 b72ed6b6-b9f8-46b5-92b4-906544132732
LimeSurvey · Jan 15, 2010 · 0a28e2a · 0a28e2a
1 parent 82b46f6
commit 0a28e2a
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/admin/dataentry.php b/admin/dataentry.php
@@ -2208,7 +2208,7 @@ function saveshow(value)
 						while ($dearow = $dearesult->FetchRow())
 						{
 							// first scale
-							$delquery = "SELECT * FROM ".db_table_name("labels")." WHERE lid={$deqrow['lid']} ORDER BY sortorder, lid, code";
+							$delquery = "SELECT * FROM ".db_table_name("labels")." WHERE lid={$deqrow['lid']} AND language='{$language}' ORDER BY sortorder, lid, code";
 							$delresult = db_execute_assoc($delquery);
 							$dataentryoutput .= "<tr><td>{$dearow['answer']}</td><td>";
                             $dataentryoutput .= "<select name='$fieldname{$dearow['code']}#0'>\n";
@@ -2220,7 +2220,7 @@ function saveshow(value)
 							}
 							// second scale
                             $dataentryoutput .= "</select></td>\n";
-							$delquery = "SELECT * FROM ".db_table_name("labels")." WHERE lid={$deqrow['lid1']} ORDER BY sortorder, lid, code";
+							$delquery = "SELECT * FROM ".db_table_name("labels")." WHERE lid={$deqrow['lid1']} AND language='{$language}' ORDER BY sortorder, lid, code";
 							$delresult = db_execute_assoc($delquery);
 							$dataentryoutput .= "<td>";
                             $dataentryoutput .="<select name='$fieldname{$dearow['code']}#1'>\n";