From f04f1ded917b702465b2da6adfb7d573fdb974ad Mon Sep 17 00:00:00 2001 From: Markus Hitter Date: Sun, 21 Apr 2019 20:34:30 +0200 Subject: [PATCH] validate.js: make validate_isName() match PHP code. --- classes/Validate.php | 3 ++- js/validate.js | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/classes/Validate.php b/classes/Validate.php index 8547f86647..a9f6c7351f 100644 --- a/classes/Validate.php +++ b/classes/Validate.php @@ -232,7 +232,8 @@ public static function isImageSize($size) } /** - * Check for name validity + * Check for name validity. This should match validate_isName() in + * js/validate.js. * * @param string $name Name to validate * diff --git a/js/validate.js b/js/validate.js index d996eacd25..0fe1632a37 100644 --- a/js/validate.js +++ b/js/validate.js @@ -106,8 +106,8 @@ var unicode_hack = (function() { */ function validate_isName(s) { - var reg = /^[^0-9!<>,;?=+()@#"°{}_$%:]+$/; - return reg.test(s); + return ! /www|http/i.test(s) + && /^[^0-9!\[\]<>;?=+()@#"°{}_$%:\/\\\*\^]*$/.test(s); } function validate_isGenericName(s)