diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-08-10 13:39:04 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-08-10 13:39:04 +0200 |
| commit | bf25e317359a409d6082ea44f0bf22fcc37160d9 (patch) | |
| tree | 37973d01e0beba65606b7271f2485d4546914016 /phpBB/phpbb | |
| parent | 489aba31c70c2b7ccafdd6941a4d2077afef0967 (diff) | |
| parent | 7cc9f216e71de8515d5adb8e4fb48e3f6456d689 (diff) | |
| download | forums-bf25e317359a409d6082ea44f0bf22fcc37160d9.tar forums-bf25e317359a409d6082ea44f0bf22fcc37160d9.tar.gz forums-bf25e317359a409d6082ea44f0bf22fcc37160d9.tar.bz2 forums-bf25e317359a409d6082ea44f0bf22fcc37160d9.tar.xz forums-bf25e317359a409d6082ea44f0bf22fcc37160d9.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/12794] Properly validate google+ field against valid character set
Diffstat (limited to 'phpBB/phpbb')
| -rw-r--r-- | phpBB/phpbb/profilefields/type/type_googleplus.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/phpbb/profilefields/type/type_googleplus.php b/phpBB/phpbb/profilefields/type/type_googleplus.php index 887baa3de1..e6729b1935 100644 --- a/phpBB/phpbb/profilefields/type/type_googleplus.php +++ b/phpBB/phpbb/profilefields/type/type_googleplus.php @@ -40,7 +40,7 @@ class type_googleplus extends type_string 'field_length' => 20, 'field_minlen' => 3, 'field_maxlen' => 255, - 'field_validation' => '[\w]+', + 'field_validation' => '(?:(?!\.{2,})([^<>=+]))+', 'field_novalue' => '', 'field_default_value' => '', ); |