diff options
| author | Chris Smith <toonarmy@phpbb.com> | 2008-09-05 19:02:36 +0000 |
|---|---|---|
| committer | Chris Smith <toonarmy@phpbb.com> | 2008-09-05 19:02:36 +0000 |
| commit | f1830947c21cf91f9b81150e32195e76c16094dd (patch) | |
| tree | 7efc840062d87ce723a20b6b5d0cf14ede7a4515 /phpBB | |
| parent | d1606c5f78503caa0d0276ea2a34b7d21a715dcf (diff) | |
| download | forums-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')
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 2 | ||||
| -rw-r--r-- | phpBB/includes/acp/acp_users.php | 4 | ||||
| -rw-r--r-- | phpBB/includes/ucp/ucp_profile.php | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 16aae3f7b8..e87b11bf09 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -111,6 +111,8 @@ <li>[Fix] Display coloured username of last poster in list of subscribed forums (prosilver).</li> <li>[Fix] Added missing UCP language string <em>NO_AUTH_READ_HOLD_MESSAGE</em>.</li> <li>[Fix] Do not jump back to page 1 when hiding member search in memberlist. (#32515 - Patch by paul)</li> + <li>[Fix] Correctly limit input of the users location to 100 characters in the UCP and ACP. (Bug #32655)</li> + <li>[Fix] Sync reports when using the move all users posts tool in the ACP. (Bug #31165)</li> </ul> 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), diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php index c323b507f7..710c48e073 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), ); |