manual merge

extension/qfq/qfq/Constants.php

@@ -146,8 +146,6 @@ const ERROR_UNKNOWN_FORWARD_MODE = 1036;
 
 const ERROR_MISSING_HIDDEN_FIELD_IN_SIP = 1038;
 
-const ERROR_MISSING_MIN_MAX = 1040; // unused
-const ERROR_MIN_MAX_VIOLATION = 1041;  // unused
 const ERROR_UNKNOWN_CHECKTYPE = 1042;
 const ERROR_PATTERN_VIOLATION = 1043;
 const ERROR_RECORDID_0_FORBIDDEN = 1044;

extension/qfq/qfq/helper/Sanitize.php

@@ -63,8 +63,9 @@ class Sanitize {
         }
 
         // Pattern check
-        if ($pattern === '' || preg_match("/$pattern/", $value) === 1)
+        if ($pattern === '' || preg_match("/$pattern/", $value) === 1) {
             return $value;
+        }
 
         // check failed
         if ($mode === SANITIZE_EXCEPTION) {