Small Fixes for assessment.

git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/phpsurveyor@2462 b72ed6b6-b9f8-46b5-92b4-906544132732
LimeSurvey · Feb 28, 2007 · a5f40c2 · a5f40c2
1 parent 88290cb
commit a5f40c2
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/admin/assessments.php b/admin/assessments.php
@@ -202,8 +202,8 @@
 function getAssessments($surveyid) {
 	global $dbprefix, $connect;
 	$query = "SELECT id, sid, scope, gid, minimum, maximum, name, message, link
-			  FROM {$dbprefix}assessments
-			  WHERE sid=$surveyid
+			  FROM ".db_table_name('assessments')."
+			  WHERE sid='$surveyid'
 			  ORDER BY scope, gid";
 	$result=db_execute_assoc($query) or die("Error getting assessments<br />$query<br />".$connect->ErrorMsg());
 	$output=array();
@@ -215,9 +215,10 @@ function getAssessments($surveyid) {
 
 function getGroups($surveyid) {
 	global $dbprefix, $connect;
+	$baselang = GetBaseLanguageFromSurveyID($sid);
 	$query = "SELECT gid, group_name
-			  FROM {$dbprefix}groups
-			  WHERE sid=$surveyid
+			  FROM ".db_table_name('groups')."
+			  WHERE sid='$surveyid' and language='$baselang'
 			  ORDER BY group_order";
 	$result = db_execute_assoc($query) or die("Error getting groups<br />$query<br />".$connect->ErrorMsg());
 	$output=array();