Merge branch 'master' into 5318-sendmail-parameters-speaking-word

extension/qfq/qfq/AbstractBuildForm.php

@@ -3177,7 +3177,6 @@ abstract class AbstractBuildForm {
         // 'maxLength' needs an upper 'L': naming convention for DB tables!
         $attribute .= $this->getAttributeList($formElement, ['size', 'maxLength']);
         $attribute .= Support::doAttribute('value', htmlentities($value), false);
-        $attribute .= $this->getAttributeList($formElement, [F_FE_DATA_PATTERN_ERROR, F_FE_DATA_REQUIRED_ERROR, F_FE_DATA_MATCH_ERROR, F_FE_DATA_ERROR]);
 
         if ($formElement[FE_PLACEHOLDER] == '') {
             $timePattern = ($formElement[FE_SHOW_SECONDS] == 1) ? 'hh:mm:ss' : 'hh:mm';
@@ -3198,6 +3197,10 @@ abstract class AbstractBuildForm {
             $formElement[FE_PLACEHOLDER] = $placeholder;
         }
 
+        if ($formElement[F_FE_DATA_PATTERN_ERROR] == '')
+            $formElement[F_FE_DATA_PATTERN_ERROR] = "Please match this format: $placeholder";
+        $attribute .= $this->getAttributeList($formElement, [F_FE_DATA_PATTERN_ERROR, F_FE_DATA_REQUIRED_ERROR, F_FE_DATA_MATCH_ERROR, F_FE_DATA_ERROR]);
+
         $attribute .= $this->getAttributeList($formElement, [FE_INPUT_AUTOCOMPLETE, 'autofocus', 'placeholder']);
         $attribute .= Support::doAttribute('data-load', ($formElement[FE_DYNAMIC_UPDATE] === 'yes') ? 'data-load' : '');
         $attribute .= Support::doAttribute('title', $formElement[FE_TOOLTIP]);

extension/qfq/qfq/helper/Support.php

@@ -798,6 +798,8 @@ class Support {
         }
         self::setIfNotSet($formElement, FE_DECIMAL_FORMAT);
 
+        self::setIfNotSet($formElement, F_FE_DATA_PATTERN_ERROR);
+
         return $formElement;
     }