aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/profilefields
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2015-01-10 12:37:11 +0100
committerMarc Alexander <admin@m-a-styles.de>2015-01-10 12:37:11 +0100
commit3cfbe7bb4fd7d046a7beb85baed7e94e3b1abca6 (patch)
tree6644b4100bfa87f1144536514b33f442cdc2105d /phpBB/phpbb/profilefields
parent56eae4660c59302f36343a15752ecf30576f3589 (diff)
parent67c987f0d06cb0898d2589c7bc12fceb4e142d68 (diff)
downloadforums-3cfbe7bb4fd7d046a7beb85baed7e94e3b1abca6.tar
forums-3cfbe7bb4fd7d046a7beb85baed7e94e3b1abca6.tar.gz
forums-3cfbe7bb4fd7d046a7beb85baed7e94e3b1abca6.tar.bz2
forums-3cfbe7bb4fd7d046a7beb85baed7e94e3b1abca6.tar.xz
forums-3cfbe7bb4fd7d046a7beb85baed7e94e3b1abca6.zip
Merge branch 'develop-ascraeus' into develop
Diffstat (limited to 'phpBB/phpbb/profilefields')
-rw-r--r--phpBB/phpbb/profilefields/type/type_string_common.php10
1 files changed, 5 insertions, 5 deletions
diff --git a/phpBB/phpbb/profilefields/type/type_string_common.php b/phpBB/phpbb/profilefields/type/type_string_common.php
index ff33a7b49c..f5e1992044 100644
--- a/phpBB/phpbb/profilefields/type/type_string_common.php
+++ b/phpBB/phpbb/profilefields/type/type_string_common.php
@@ -18,11 +18,11 @@ abstract class type_string_common extends type_base
protected $validation_options = array(
'CHARS_ANY' => '.*',
'NUMBERS_ONLY' => '[0-9]+',
- 'ALPHA_ONLY' => '[\w]+',
- 'ALPHA_UNDERSCORE' => '[\w_]+',
- 'ALPHA_DOTS' => '[\w.]+',
- 'ALPHA_SPACERS' => '[\w\x20_+\-\[\]]+',
- 'ALPHA_PUNCTUATION' => '[a-zA-Z][\w\.,\-_]+',
+ 'ALPHA_ONLY' => '[a-zA-Z0-9]+',
+ 'ALPHA_UNDERSCORE' => '[\w]+',
+ 'ALPHA_DOTS' => '[a-zA-Z0-9.]+',
+ 'ALPHA_SPACERS' => '[\w\x20+\-\[\]]+',
+ 'ALPHA_PUNCTUATION' => '[a-zA-Z][\w\.,\-]+',
'LETTER_NUM_ONLY' => '[\p{Lu}\p{Ll}0-9]+',
'LETTER_NUM_UNDERSCORE' => '[\p{Lu}\p{Ll}0-9_]+',
'LETTER_NUM_DOTS' => '[\p{Lu}\p{Ll}0-9.]+',