Merge branch 'master' of github.com:LimeSurvey/LimeSurvey

LimeSurvey · Nov 1, 2012 · 464b9b7 · 464b9b7
2 parents 31fcd61 + c14762f
commit 464b9b7
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 10 deletions.
diff --git a/application/controllers/admin/dataentry.php b/application/controllers/admin/dataentry.php
@@ -2324,7 +2324,6 @@ public function view($surveyid, $lang=NULL)
                             unset($answers);
                             break;
                         case "M": //Multiple choice checkbox (Quite tricky really!)
-                            //                            $qidattributes=getQuestionAttributeValues($deqrow['qid']);
                             if (trim($qidattributes['display_columns'])!='')
                             {
                                 $dcols=$qidattributes['display_columns'];
@@ -2336,11 +2335,10 @@ public function view($surveyid, $lang=NULL)
                             $meaquery = "SELECT title, question FROM {{questions}} WHERE parent_qid={$deqrow['qid']} AND language='{$sDataEntryLanguage}' ORDER BY question_order";
                             $mearesult = dbExecuteAssoc($meaquery);
 
-
-                            $cdata['dcols'] = $dcols;
-                            $cdata['meacount'] = $meacount;
                             $cdata['mearesult'] = $mearesult->readAll();
                             $meacount = count($cdata['mearesult']);
+                            $cdata['meacount'] = $meacount;
+                            $cdata['dcols'] = $dcols;
 
                             break;
                         case "I": //Language Switch

diff --git a/application/controllers/admin/export.php b/application/controllers/admin/export.php
@@ -135,6 +135,8 @@ public function exportresults()
         if ( ! isset($type) ) { $type = returnGlobal('type'); }
         if ( ! isset($convertyto1) ) { $convertyto1 = returnGlobal('convertyto1'); }
         if ( ! isset($convertnto2) ) { $convertnto2 = returnGlobal('convertnto2'); }
+        if ( ! isset($convertyto) ) { $convertyto = returnGlobal('convertyto'); }
+        if ( ! isset($convertnto) ) { $convertnto = returnGlobal('convertnto'); }
         if ( ! isset($convertspacetous) ) { $convertspacetous = returnGlobal('convertspacetous'); }
         $clang = Yii::app()->lang;
 
@@ -219,14 +221,14 @@ public function exportresults()
 
         if ( $options->convertN )
         {
-            $options->nValue = $convertnto2;
+            $options->nValue = $convertnto;
         }
 
         $options->convertY = $convertyto1;
 
         if ( $options->convertY )
         {
-            $options->yValue = $convertyto1;
+            $options->yValue = $convertyto;
         }
 
         $options->headerSpacesToUnderscores = $convertspacetous;

diff --git a/application/controllers/admin/surveypermission.php b/application/controllers/admin/surveypermission.php
@@ -83,10 +83,9 @@ function index($surveyid)
 
                     if(isset($group_ids) && $group_ids[0] != NULL)
                     {
-                        $group_ids_query = implode(" OR ugid=", $group_ids);
+                        $group_ids_query = implode(",", $group_ids);
                         unset($group_ids);
-
-                        $result4 = User_groups::model()->findAll('ugid = :ugid',array(':ugid' => $group_ids_query));
+                        $result4 = User_groups::model()->findAll("ugid IN ($group_ids_query)");                        
 
                         foreach ($result4 as $resul4row)
                         {

diff --git a/application/helpers/common_helper.php b/application/helpers/common_helper.php
@@ -2981,7 +2981,7 @@ function getSavedCount($surveyid)
 {
     $surveyid=(int)$surveyid;
 
-    return Saved_control::getCountOfAll($surveyid);
+    return Saved_control::model()->getCountOfAll($surveyid);
 }
 
 /**