Fixed issue #8295: Data for additional token attributes is not saved

LimeSurvey · Oct 21, 2013 · a9de650 · Shnoulle · Oct 22, 2013 · c-schmitz
1 parent 33e8418
commit a9de650
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/application/controllers/admin/tokens.php b/application/controllers/admin/tokens.php
@@ -522,7 +522,12 @@ function getSearch_json($iSurveyId)
         return $this->getTokens_json($iSurveyId, $condition);
     }
 
-    function editToken($iSurveyId) // Used ? 2013-01-29
+    /**
+    * Called by jqGrid if a token is saved after editing
+    * 
+    * @param mixed $iSurveyId The Survey ID
+    */
+    function editToken($iSurveyId) 
     {
         $clang = $this->getController()->lang;
         if (!hasSurveyPermission($iSurveyId, 'tokens', 'update') && !hasSurveyPermission($iSurveyId, 'tokens', 'create'))

diff --git a/application/helpers/common_helper.php b/application/helpers/common_helper.php
@@ -5416,10 +5416,7 @@ function GetParticipantAttributes($iSurveyID)
 {
     if (!tableExists("{{tokens_{$iSurveyID}}}") || !$table = Yii::app()->db->schema->getTable('{{tokens_'.$iSurveyID.'}}'))
         return Array();
-    $aFields= array_filter(array_keys($table->columns), 'filterForAttributes');
-    $aTokenAttributes=Survey::model()->findByPk($iSurveyID)->tokenAttributes;
-    if (count($aFields)==0) return  array();
-    return array_intersect_key($aTokenAttributes,array_flip($aFields));
+    return getTokenFieldsAndNames($iSurveyID,true);
 }