aboutsummaryrefslogtreecommitdiff
path: root/engine/lib/users.php
diff options
context:
space:
mode:
authorSem <sembrestels@riseup.net>2012-07-01 23:31:08 +0200
committerSem <sembrestels@riseup.net>2012-07-01 23:31:08 +0200
commitea0140d87534c3b10e489d13a1449ebb79da832d (patch)
tree85667ae651bc5cc9f0ea01c6f3871bbdee36a469 /engine/lib/users.php
parent157117475338bcaab5fc3453ec54250343da595c (diff)
parent671f9ba4e1b1972d8eaf22acfb626fa2c85af0f2 (diff)
downloadelgg-ea0140d87534c3b10e489d13a1449ebb79da832d.tar.gz
elgg-ea0140d87534c3b10e489d13a1449ebb79da832d.tar.bz2
Merge branch 'lorea-preprod'
Diffstat (limited to 'engine/lib/users.php')
-rw-r--r--engine/lib/users.php8
1 files changed, 7 insertions, 1 deletions
diff --git a/engine/lib/users.php b/engine/lib/users.php
index e209f2c38..241b524f9 100644
--- a/engine/lib/users.php
+++ b/engine/lib/users.php
@@ -810,6 +810,12 @@ function validate_username($username) {
$msg = elgg_echo('registration:usernametooshort', array($CONFIG->minusername));
throw new RegistrationException($msg);
}
+
+ // username in the database has a limit of 128 characters
+ if (strlen($username) > 128) {
+ $msg = elgg_echo('registration:usernametoolong', array(128));
+ throw new RegistrationException($msg);
+ }
// Blacklist for bad characters (partially nicked from mediawiki)
$blacklist = '/[' .
@@ -1556,7 +1562,7 @@ function users_init() {
elgg_register_action('friends/remove');
elgg_register_action('avatar/upload');
elgg_register_action('avatar/crop');
- elgg_register_action('avatar/revert');
+ elgg_register_action('avatar/remove');
elgg_register_action('profile/edit');
elgg_register_action('friends/collections/add');