mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-02 12:48:26 +02:00
Code Issues Releases Wiki Activity

Bugtracker #4861 - required but disabled extended user fields weren't ignored

Browse Source
This commit is contained in:
e107steved
2009-11-23 21:04:22 +00:00
parent 5be363265f
commit 773affcd66
2 changed files with 32 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
class2.php
View File

@@ -9,9 +9,9 @@
* General purpose file * General purpose file
* *
* $Source: /cvs_backup/e107_0.8/class2.php,v $ * $Source: /cvs_backup/e107_0.8/class2.php,v $
* $Revision: 1.162 $ * $Revision: 1.163 $
* $Date: 2009-11-22 23:36:23 $ * $Date: 2009-11-23 21:04:16 $
* $Author: e107coders $ * $Author: e107steved $
* *
*/ */
// //
@@ -1964,7 +1964,7 @@ function force_userupdate()
if (!varset($pref['disable_emailcheck'],TRUE) && !trim($currentUser['user_email'])) return TRUE; if (!varset($pref['disable_emailcheck'],TRUE) && !trim($currentUser['user_email'])) return TRUE;
if($sql -> db_Select('user_extended_struct', 'user_extended_struct_name, user_extended_struct_type', 'user_extended_struct_required = 1')) if($sql -> db_Select('user_extended_struct', 'user_extended_struct_name, user_extended_struct_type', 'user_extended_struct_required = 1 AND user_extended_struct_applicable != '.e_UC_NOBODY))
{ {
while($row = $sql -> db_Fetch()) while($row = $sql -> db_Fetch())
{ {

9
e107_handlers/user_extended_class.php
View File

@@ -11,9 +11,9 @@
| GNU General Public License (http://gnu.org). | GNU General Public License (http://gnu.org).
| |
| $Source: /cvs_backup/e107_0.8/e107_handlers/user_extended_class.php,v $ | $Source: /cvs_backup/e107_0.8/e107_handlers/user_extended_class.php,v $
| $Revision: 1.30 $ | $Revision: 1.31 $
| $Date: 2009-11-18 01:04:43 $ | $Date: 2009-11-23 21:04:22 $
| $Author: e107coders $ | $Author: e107steved $
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
@@ -222,6 +222,8 @@ class e107_user_extended
$eufVals = array(); // 'Answer' array $eufVals = array(); // 'Answer' array
$hideFlags = array(); $hideFlags = array();
foreach ($this->fieldDefinitions as $k => $defs) foreach ($this->fieldDefinitions as $k => $defs)
{
if ($defs['user_extended_struct_applicable'] != e_UC_NOBODY)
{ {
$f = 'user_'.$defs['user_extended_struct_name']; $f = 'user_'.$defs['user_extended_struct_name'];
if (isset($inArray[$f]) || ($isSignup && ($defs['user_extended_struct_required'] == 1))) if (isset($inArray[$f]) || ($isSignup && ($defs['user_extended_struct_required'] == 1)))
@@ -248,6 +250,7 @@ class e107_user_extended
} }
} }
} }
}
$hidden_fields = implode("^", $hideFlags); $hidden_fields = implode("^", $hideFlags);
if ($hidden_fields != "") if ($hidden_fields != "")
{ {