aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/ucp/ucp_profile.php
diff options
context:
space:
mode:
authorChris Smith <toonarmy@phpbb.com>2008-09-08 13:39:34 +0000
committerChris Smith <toonarmy@phpbb.com>2008-09-08 13:39:34 +0000
commit0e0100c5255dd288cc479274a112e4eb42a4bacf (patch)
tree1013fd8ea222d4e4fbab3d360fc25be2d59218b0 /phpBB/includes/ucp/ucp_profile.php
parenta32f3a67095327dc3e75c01ba21bbb90ad479c83 (diff)
downloadforums-0e0100c5255dd288cc479274a112e4eb42a4bacf.tar
forums-0e0100c5255dd288cc479274a112e4eb42a4bacf.tar.gz
forums-0e0100c5255dd288cc479274a112e4eb42a4bacf.tar.bz2
forums-0e0100c5255dd288cc479274a112e4eb42a4bacf.tar.xz
forums-0e0100c5255dd288cc479274a112e4eb42a4bacf.zip
merge r8829, r8830, r8831, r8832, r8833, r8834, r8835, r8836, r8837, r8838
git-svn-id: file:///svn/phpbb/trunk@8839 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/ucp/ucp_profile.php')
-rw-r--r--phpBB/includes/ucp/ucp_profile.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php
index 782293294e..b19fd1056e 100644
--- a/phpBB/includes/ucp/ucp_profile.php
+++ b/phpBB/includes/ucp/ucp_profile.php
@@ -315,7 +315,7 @@ class ucp_profile
'website' => array(
array('string', true, 12, 255),
array('match', true, '#^http[s]?://(.*?\.)*?[a-z0-9\-]+\.[a-z]{2,4}#i')),
- 'location' => array('string', true, 2, 255),
+ 'location' => array('string', true, 2, 100),
'occupation' => array('string', true, 2, 500),
'interests' => array('string', true, 2, 500),
);