tonyair/silverstripe-userforms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-userforms.git synced 2024-10-22 17:05:42 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch '5.3'

Browse Source
This commit is contained in:
Robbie Averill 2018-12-03 09:20:26 +00:00
commit d71c482685
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/thirdparty/jquery-validate/localization/methods_de.js vendored
View File

@ -12,7 +12,7 @@
*/ */
$.extend($.validator.methods, { $.extend($.validator.methods, {
date: function(value, element) { date: function(value, element) {
return this.optional(element) || /^\d\d?\.\d\d?\.\d\d\d?\d?$/.test(value); return this.optional(element) || /^[\d]{1,4}\-[0-1][0-9]\-[0-3][0-9]?$/.test(value);
}, },
number: function(value, element) { number: function(value, element) {
return this.optional(element) || /^-?(?:\d+|\d{1,3}(?:\.\d{3})+)(?:,\d+)?$/.test(value); return this.optional(element) || /^-?(?:\d+|\d{1,3}(?:\.\d{3})+)(?:,\d+)?$/.test(value);

2
client/thirdparty/jquery-validate/localization/methods_de.min.js vendored
View File

@ -1,4 +1,4 @@
/*! jQuery Validation Plugin - v1.13.1 - 10/14/2014 /*! jQuery Validation Plugin - v1.13.1 - 10/14/2014
* http://jqueryvalidation.org/ * http://jqueryvalidation.org/
* Copyright (c) 2014 Jörn Zaefferer; Licensed MIT */ * Copyright (c) 2014 Jörn Zaefferer; Licensed MIT */
!function(a){"function"==typeof define&&define.amd?define(["jquery","../jquery.validate.min"],a):a(jQuery)}(function(a){a.extend(a.validator.methods,{date:function(a,b){return this.optional(b)||/^\d\d?\.\d\d?\.\d\d\d?\d?$/.test(a)},number:function(a,b){return this.optional(b)||/^-?(?:\d+|\d{1,3}(?:\.\d{3})+)(?:,\d+)?$/.test(a)}})}); !function(a){"function"==typeof define&&define.amd?define(["jquery","../jquery.validate.min"],a):a(jQuery)}(function(a){a.extend(a.validator.methods,{date:function(a,b){return this.optional(b)||/^[\d]{1,4}\-[0-1][0-9]\-[0-3][0-9]?$/.test(a)},number:function(a,b){return this.optional(b)||/^-?(?:\d+|\d{1,3}(?:\.\d{3})+)(?:,\d+)?$/.test(a)}})});

2
client/thirdparty/jquery-validate/localization/methods_nl.js vendored
View File

@ -12,7 +12,7 @@
*/ */
$.extend($.validator.methods, { $.extend($.validator.methods, {
date: function(value, element) { date: function(value, element) {
return this.optional(element) || /^\d\d?[\.\/\-]\d\d?[\.\/\-]\d\d\d?\d?$/.test(value); return this.optional(element) || /^[\d]{1,4}\-[0-1][0-9]\-[0-3][0-9]?$/.test(value);
} }
}); });

2
client/thirdparty/jquery-validate/localization/methods_nl.min.js vendored
View File

@ -1,4 +1,4 @@
/*! jQuery Validation Plugin - v1.13.1 - 10/14/2014 /*! jQuery Validation Plugin - v1.13.1 - 10/14/2014
* http://jqueryvalidation.org/ * http://jqueryvalidation.org/
* Copyright (c) 2014 Jörn Zaefferer; Licensed MIT */ * Copyright (c) 2014 Jörn Zaefferer; Licensed MIT */
!function(a){"function"==typeof define&&define.amd?define(["jquery","../jquery.validate.min"],a):a(jQuery)}(function(a){a.extend(a.validator.methods,{date:function(a,b){return this.optional(b)||/^\d\d?[\.\/\-]\d\d?[\.\/\-]\d\d\d?\d?$/.test(a)}})}); !function(a){"function"==typeof define&&define.amd?define(["jquery","../jquery.validate.min"],a):a(jQuery)}(function(a){a.extend(a.validator.methods,{date:function(a,b){return this.optional(b)||/^[\d]{1,4}\-[0-1][0-9]\-[0-3][0-9]?$/.test(a)}})});

4
code/Model/Recipient/EmailRecipient.php
View File

@ -506,8 +506,8 @@ class EmailRecipient extends DataObject
$templatePath = substr($absoluteFilename, strlen($prefixToStrip) + 1); $templatePath = substr($absoluteFilename, strlen($prefixToStrip) + 1);
// Optionally remove "templates/" prefixes // Optionally remove "templates/" prefixes
if (substr($templatePath, 0, 10)) { if (preg_match('/(?<=templates\/).*$/', $templatePath, $matches)) {
$templatePath = substr($templatePath, 10); $templatePath = $matches[0];
} }
$templates[$templatePath] = $template['filename']; $templates[$templatePath] = $template['filename'];