aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/ucp
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2007-06-08 08:28:55 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2007-06-08 08:28:55 +0000
commiteaa66690104c130eb15aef16a01a393611d257a8 (patch)
tree61068cb11896b28b7cfc7b248fce321f8176e2ab /phpBB/includes/ucp
parent011b47c01deded9e8e933cd1ca48fa4cec557ee5 (diff)
downloadforums-eaa66690104c130eb15aef16a01a393611d257a8.tar
forums-eaa66690104c130eb15aef16a01a393611d257a8.tar.gz
forums-eaa66690104c130eb15aef16a01a393611d257a8.tar.bz2
forums-eaa66690104c130eb15aef16a01a393611d257a8.tar.xz
forums-eaa66690104c130eb15aef16a01a393611d257a8.zip
other fixes
git-svn-id: file:///svn/phpbb/trunk@7726 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/ucp')
-rw-r--r--phpBB/includes/ucp/ucp_profile.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php
index db91c90803..0134bd38e7 100644
--- a/phpBB/includes/ucp/ucp_profile.php
+++ b/phpBB/includes/ucp/ucp_profile.php
@@ -261,7 +261,7 @@ class ucp_profile
'aim' => request_var('aim', $user->data['user_aim']),
'msn' => request_var('msn', $user->data['user_msnm']),
'yim' => request_var('yim', $user->data['user_yim']),
- 'jabber' => request_var('jabber', $user->data['user_jabber']),
+ 'jabber' => utf8_normalize_nfc(request_var('jabber', $user->data['user_jabber'], true)),
'website' => request_var('website', $user->data['user_website']),
'location' => utf8_normalize_nfc(request_var('location', $user->data['user_from'], true)),
'occupation' => utf8_normalize_nfc(request_var('occupation', $user->data['user_occ'], true)),
@@ -290,7 +290,7 @@ class ucp_profile
'msn' => array('string', true, 5, 255),
'jabber' => array(
array('string', true, 5, 255),
- array('match', true, '#^[^@:\'"<>&\x00-\x1F\x7F\t\r\n]+@(.*?\.)*?[a-z0-9\-_]+?\.[a-z]{2,4}(/.*)?$#iu')),
+ array('jabber')),
'yim' => array('string', true, 5, 255),
'website' => array(
array('string', true, 12, 255),