Merge branch '5834-we-cannot-use-askme-in-booleanattribute-and-selectattribute' into '1.3-dev'

Resolve "We cannot use "askme" in BooleanAttribute and SelectAttribute"

See merge request fusiondirectory/fd!276

include/simpleplugin/attributes/class_SelectAttribute.inc

@@ -66,6 +66,12 @@ class SelectAttribute extends Attribute
         array_unshift($outputs, _('None'));
       }
     }
+    if ($this->isTemplate() && !in_array('%askme%', $choices)) {
+      $choices[] = '%askme%';
+      if (is_array($outputs)) {
+        $outputs[] = '%askme%';
+      }
+    }
     $this->choices = $choices;
     if (!in_array($this->defaultValue, $this->choices, TRUE) && isset($this->choices[0])) {
       $this->defaultValue = $this->choices[0];
@@ -202,6 +208,15 @@ class SelectAttribute extends Attribute
   {
     $this->size = $size;
   }
+
+  function setParent (&$plugin)
+  {
+    parent::setParent($plugin);
+    if ($this->isTemplate() && !in_array('%askme%', $this->choices)) {
+      $this->choices[]          = '%askme%';
+      $this->outputs['%askme%'] = '%askme%';
+    }
+  }
 }
 
 /*! \brief This class allows to handle a select attribute which allow to choose an object