Changeset 9929 for branches/2.1


Ignore:
Timestamp:
Mar 29, 2011, 9:59:09 PM (13 years ago)
Author:
patdenice
Message:

merge r9923 from trunk to branch 2.1
bug:2234
HTML characters are allowed in username

Location:
branches/2.1
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • branches/2.1

    • Property svn:mergeinfo changed
      /trunkmerged: 9923

  • branches/2.1/include/functions_user.inc.php

    r6661 r9929  
    112112  {
    113113    array_push($errors, l10n('this login is already used'));
     114  }
     115  if ($login != strip_tags($login))
     116  {
     117    array_push($errors, l10n('html tags are not allowed in login'));
    114118  }
    115119  $mail_error = validate_mail_address(null, $mail_address);

  • branches/2.1/language/en_UK/common.lang.php

    r6418 r9929  
    378378$lang['delete this comment'] = "delete this comment";
    379379$lang['validate this comment'] = 'validate this comment';
     380$lang['html tags are not allowed in login'] = 'html tags are not allowed in login';
    380381?>

  • branches/2.1/language/fr_FR/common.lang.php

    r7528 r9929  
    380380$lang['delete this comment'] = "supprimer ce commentaire";
    381381$lang['validate this comment'] = 'valider ce commentaire';
     382$lang['html tags are not allowed in login'] = 'les balises html ne sont pas autorisées dans le login';
    382383?>

  • branches/2.1/register.php

    r6364 r9929  
    4747
    4848  $errors =
    49       register_user(htmlspecialchars($_POST['login'],ENT_COMPAT,'utf-8'),
     49      register_user($_POST['login'],
    5050                    $_POST['password'],
    5151                    $_POST['mail_address'],
Note: See TracChangeset for help on using the changeset viewer.