aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acp/acp_users.php
diff options
context:
space:
mode:
authorChris Smith <toonarmy@phpbb.com>2008-09-05 19:02:36 +0000
committerChris Smith <toonarmy@phpbb.com>2008-09-05 19:02:36 +0000
commitf1830947c21cf91f9b81150e32195e76c16094dd (patch)
tree7efc840062d87ce723a20b6b5d0cf14ede7a4515 /phpBB/includes/acp/acp_users.php
parentd1606c5f78503caa0d0276ea2a34b7d21a715dcf (diff)
downloadforums-f1830947c21cf91f9b81150e32195e76c16094dd.tar
forums-f1830947c21cf91f9b81150e32195e76c16094dd.tar.gz
forums-f1830947c21cf91f9b81150e32195e76c16094dd.tar.bz2
forums-f1830947c21cf91f9b81150e32195e76c16094dd.tar.xz
forums-f1830947c21cf91f9b81150e32195e76c16094dd.zip
Correctly limit input of the users location to 100 characters in the UCP and ACP. Closes #32655
Sync reports when using the move all users posts tool in the ACP. Closes #31165 git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8831 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/acp/acp_users.php')
-rw-r--r--phpBB/includes/acp/acp_users.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php
index 9749ba8950..05a087f4c3 100644
--- a/phpBB/includes/acp/acp_users.php
+++ b/phpBB/includes/acp/acp_users.php
@@ -634,7 +634,7 @@ class acp_users
if (sizeof($topic_id_ary))
{
- sync('reported', 'topic_id', $topic_id_ary);
+ sync('topic_reported', 'topic_id', $topic_id_ary);
sync('topic', 'topic_id', $topic_id_ary);
}
@@ -1093,7 +1093,7 @@ class acp_users
'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),
'bday_day' => array('num', true, 1, 31),