1.1 --- a/public_html/admin/user.php	Sat Oct 03 16:32:24 2009 +0200
     1.2 +++ b/public_html/admin/user.php	Sat Oct 03 19:34:59 2009 +0200
     1.3 @@ -521,6 +521,18 @@
     1.4              return edituser($uid, 56);
     1.5          }
     1.6  
     1.7 +        if ($_CONF['custom_registration'] &&
     1.8 +                function_exists('CUSTOM_userCheck')) {
     1.9 +            $ret = CUSTOM_userCheck($username, $email);
    1.10 +            if (! empty($ret)) {
    1.11 +                // need a numeric return value - otherwise use default message
    1.12 +                if (! is_numeric($ret['number'])) {
    1.13 +                    $ret['number'] = 400;
    1.14 +                }
    1.15 +                return edituser($uid, $ret['number']);
    1.16 +            }
    1.17 +        }
    1.18 +
    1.19          if (empty ($uid) || !empty ($passwd)) {
    1.20              $passwd = SEC_encryptPassword($passwd);
    1.21          } else {

     2.1 --- a/public_html/docs/history	Sat Oct 03 16:32:24 2009 +0200
     2.2 +++ b/public_html/docs/history	Sat Oct 03 19:34:59 2009 +0200
     2.3 @@ -3,13 +3,16 @@
     2.4  Oct ??, 2009 (1.6.1)
     2.5  ------------
     2.6  
     2.7 +- Call CUSTOM_userCheck from admin/user.php (bug #0000925) [Dirk]
     2.8 +- You can now have one featured story per topic (feature request #0000750,
     2.9 +  patch provided by Tom Homer)
    2.10  - Changing the Post Mode in Advanced Editor mode selected the wrong tab
    2.11    (bug #0000980, patch provided by dengen)
    2.12  - Made the former $cc parameter for COM_mail an optional array of additional
    2.13    email headers (using a string for that parameter still works as CC:) [Dirk]
    2.14  - Fixed reply notification for the very first comment (bug #0000973)
    2.15    [dengen, Dirk]
    2.16 -- When an anonymous commentor left a name, use it in the comment notification
    2.17 +- When an anonymous commenter left a name, use it in the comment notification
    2.18    email (bug #0000960) [Dirk]
    2.19  - Removed the CSRF token from all links to edit a comment. We only need it in
    2.20    the actual comment editor and it caused problems on the moderation page [Dirk]