Fixed issue: Tokenattributedescription not used in token table

LimeSurvey · Aug 15, 2018 · 56f41a0 · 56f41a0
1 parent 39208bb
commit 56f41a0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/application/controllers/admin/tokens.php b/application/controllers/admin/tokens.php
@@ -1017,14 +1017,14 @@ public function managetokenattributes($iSurveyId)
         $aData['thissurvey'] = $oSurvey->attributes;
         $aData['surveyid'] = $iSurveyId;
         $aData['tokenfields'] = getAttributeFieldNames($iSurveyId);
-        $aData['tokenfielddata'] = decodeTokenAttributes($oSurvey->attributedescriptions);
+        $aData['tokenfielddata'] = $oSurvey->decodedAttributedescriptions;
         // Prepare token fiel list for dropDownList
         $tokenfieldlist = array();
         foreach ($aData['tokenfields'] as $tokenfield) {
             if (isset($aData['tokenfielddata'][$tokenfield])) {
-                            $description = $aData['tokenfielddata'][$tokenfield]['description'];
+                $description = $aData['tokenfielddata'][$tokenfield]['description'];
             } else {
-                            $description = "";
+                $description = "";
             }
             $description = sprintf(gT("Attribute %s (%s)"), str_replace("attribute_", "", $tokenfield), $description);
             $tokenfieldlist[] = array("id"=>$tokenfield, "description"=>$description);

diff --git a/application/models/Survey.php b/application/models/Survey.php
@@ -644,7 +644,10 @@ public function getTokenAttributes()
         $allKnowAttributes = $attdescriptiondata;
         // Without token table : all attribute $this->attributedescriptions AND real attribute. @see issue #13924
         if($this->getHasTokensTable()){
-            $allKnowAttributes = array_intersect_key(array_merge($attdescriptiondata,Token::model($this->sid)->getAttributes()),Token::model($this->sid)->getAttributes());
+            $allKnowAttributes = array_intersect_key(
+                ( $attdescriptiondata + Token::model($this->sid)->getAttributes()),
+                Token::model($this->sid)->getAttributes()
+            );
             // We remove deleted attribute even if deleted manually in DB
         }
         $aCompleteData = array();