Merge branch '6138-selectattribute-should-also-reset-postvalue-is-setchoices' into '1.4-dev'

Resolve "SelectAttribute should also reset postValue is setChoices"

See merge request fusiondirectory/fd!847

include/simpleplugin/attributes/class_SelectAttribute.inc

@@ -76,8 +76,12 @@ class SelectAttribute extends Attribute
       }
     }
     $this->choices = $choices;
-    if (!in_array($this->defaultValue, $this->choices, TRUE) && isset($this->choices[0])) {
-      $this->defaultValue = $this->choices[0];
+    if (!in_array($this->defaultValue, $this->choices, TRUE)) {
+      if (isset($this->choices[0])) {
+        $this->defaultValue = $this->choices[0];
+      } else {
+        $this->defaultValue = '';
+      }
     }
     if (is_array($outputs)) {
       $this->setDisplayChoices($outputs);
@@ -85,6 +89,10 @@ class SelectAttribute extends Attribute
     if (!in_array($this->value, $this->choices)) {
       $this->resetToDefault();
     }
+    if (!in_array($this->postValue, $this->choices)) {
+      /* We may be called between readPostValue and applyPostValue */
+      $this->postValue = $this->defaultValue;
+    }
   }
 
   /*! \brief Set the display options of the select attribute