Fixed issue #6909: Incorrect group order while copying question

LimeSurvey · Nov 23, 2012 · 2dbc801 · 2dbc801
1 parent c7ce924
commit 2dbc801
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/application/helpers/common_helper.php b/application/helpers/common_helper.php
@@ -956,7 +956,7 @@ function getGroupList3($gid,$surveyid)
 
     //$gidquery = "SELECT gid, group_name FROM ".db_table_name('groups')." WHERE sid=$surveyid AND language='{$s_lang}' ORDER BY group_order";
 
-    $gidresult = Groups::model()->findAllByAttributes(array('sid' => $surveyid, 'language' => $s_lang));
+    $gidresult = Groups::model()->findAllByAttributes(array('sid' => $surveyid, 'language' => $s_lang), array('order'=>'group_order'));
 
     foreach ($gidresult as $gv)
     {

diff --git a/application/views/admin/token/browse.php b/application/views/admin/token/browse.php
@@ -18,7 +18,6 @@
     $langnames = implode(";", $lname);
     // Build the columnNames for the extra attributes 
     // and, build the columnModel
-    $names = array_keys(getTokenFieldsAndNames($surveyid, true));
     $attributes = getTokenFieldsAndNames($surveyid,true);
     $uidNames=$columnNames=$aColumnHeader=array();
     if (count($attributes) > 0)