diff options
author | Meik Sievertsen <acydburn@phpbb.com> | 2009-05-01 10:10:35 +0000 |
---|---|---|
committer | Meik Sievertsen <acydburn@phpbb.com> | 2009-05-01 10:10:35 +0000 |
commit | 601bb75d3c19c8a2a3f98e9c912507f82677f1e2 (patch) | |
tree | e3c2ebe843fc6b4a7362d9d3df27e48c7e2adc41 /phpBB | |
parent | 864c63406078cc2b4a7ea2e256598c3c5a86f265 (diff) | |
download | forums-601bb75d3c19c8a2a3f98e9c912507f82677f1e2.tar forums-601bb75d3c19c8a2a3f98e9c912507f82677f1e2.tar.gz forums-601bb75d3c19c8a2a3f98e9c912507f82677f1e2.tar.bz2 forums-601bb75d3c19c8a2a3f98e9c912507f82677f1e2.tar.xz forums-601bb75d3c19c8a2a3f98e9c912507f82677f1e2.zip |
Fix for #r9342 for bug #41385
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9504 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
-rw-r--r-- | phpBB/docs/CHANGELOG.html | 2 | ||||
-rw-r--r-- | phpBB/includes/functions_profile_fields.php | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 8210aac2dc..c741b2e3bb 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -104,7 +104,7 @@ <li>[Fix] Various XHTML mistakes in prosilver, subsilver2 and the ACP. (Bugs #41745, #42265 - Patch by nickvergessen, #38465, #43015)</li> <li>[Fix] Log password changes via password reset function. (Bug #41365)</li> <li>[Fix] Poll, negative durations generate error (Bug #41295 - Patch by TerraFrost)</li> - <li>[Fix] Visibility of custom field on registration is incorrectly controlled by setting "display" (Bug #41385 - Patch by Eelke)</li> + <li>[Fix] Visibility of custom field on registration is incorrectly controlled by setting "display" (Bug #41385 - Patch by Eelke and fade2gray)</li> <li>[Fix] Smilies in username are misparsed on [quote=""] (Bug #41955 - Patch by TerraFrost)</li> <li>[Fix] Deleting all posts in a topic - bad redirect (Bug #41705 - Patch by TerraFrost)</li> <li>[Fix] Deleted users still appear logged in (Bug #41985 - Patch by TerraFrost)</li> diff --git a/phpBB/includes/functions_profile_fields.php b/phpBB/includes/functions_profile_fields.php index 60abe122ce..26a1feb126 100644 --- a/phpBB/includes/functions_profile_fields.php +++ b/phpBB/includes/functions_profile_fields.php @@ -270,8 +270,8 @@ class custom_profile switch ($mode) { case 'register': - // If the field is required we show it on the registration page and do not show hidden fields - $sql_where .= ' AND f.field_show_on_reg = 1 AND f.field_no_view = 0'; + // If the field is required we show it on the registration page + $sql_where .= ' AND f.field_show_on_reg = 1'; break; case 'profile': |