Fixed issue #8833: RemoteControl activate_tokens throws error but act…

…ion is done using imported survey
LimeSurvey · Mar 19, 2014 · 29ac2a1 · 29ac2a1
1 parent ea56cd6
commit 29ac2a1
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/application/helpers/admin/token_helper.php b/application/helpers/admin/token_helper.php
@@ -56,6 +56,7 @@ function createTokenTable($iSurveyID, $aAttributeFields=array())
         $tokenattributefieldnames = Survey::model()->findByPk($iSurveyID)->tokenAttributes;
         foreach($tokenattributefieldnames as $attrname=>$attrdetails)
         {
+            if (isset($fields[$attrname])) continue; // Field was already created
             Yii::app()->db->createCommand(Yii::app()->db->getSchema()->addColumn("{{tokens_".intval($iSurveyID)."}}", $attrname, 'VARCHAR(255)'))->execute();
         }
         Yii::app()->db->schema->getTable($sTableName, true); // Refresh schema cache just in case the table existed in the past