diff options
| -rw-r--r-- | engine/lib/notification.php | 6 | ||||
| -rw-r--r-- | engine/lib/users.php | 4 | ||||
| -rw-r--r-- | languages/en.php | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/engine/lib/notification.php b/engine/lib/notification.php index 726f76993..7f949c32f 100644 --- a/engine/lib/notification.php +++ b/engine/lib/notification.php @@ -249,10 +249,10 @@ function email_notify_handler(ElggEntity $from, ElggUser $to, $subject, $message // From $site = get_entity($CONFIG->site_guid); // If there's an email address, use it - but only if its not from a user. - if ((isset($from->email)) && (!($from instanceof ElggUser))) { + if (!($from instanceof ElggUser) && $from->email) { $from = $from->email; - } else if (($site) && (isset($site->email))) { - // Has the current site got a from email address? + } else if ($site && $site->email) { + // Use email address of current site if we cannot use sender's email $from = $site->email; } else { // If all else fails, use the domain of the site. diff --git a/engine/lib/users.php b/engine/lib/users.php index fcc10133f..99ef15246 100644 --- a/engine/lib/users.php +++ b/engine/lib/users.php @@ -1435,10 +1435,10 @@ function validate_username($username) { } // Belts and braces TODO: Tidy into main unicode - $blacklist2 = '/\\"\'*& ?#%^(){}[]~?<>;|¬`@-+='; + $blacklist2 = '\'/\\"*& ?#%^(){}[]~?<>;|¬`@-+='; for ($n=0; $n < strlen($blacklist2); $n++) { if (strpos($username, $blacklist2[$n])!==false) { - throw new RegistrationException(elgg_echo('registration:invalidchars')); + throw new RegistrationException(sprintf(elgg_echo('registration:invalidchars'), $blacklist2[$n], $blacklist2)); } } diff --git a/languages/en.php b/languages/en.php index 004c6e9f9..8136601b3 100644 --- a/languages/en.php +++ b/languages/en.php @@ -391,7 +391,7 @@ To remove a widget drag it back to the <b>Widget gallery</b>.", 'registration:usernametooshort' => 'Your username must be a minimum of 4 characters long.', 'registration:passwordtooshort' => 'The password must be a minimum of 6 characters long.', 'registration:dupeemail' => 'This email address has already been registered.', - 'registration:invalidchars' => 'Sorry, your username contains invalid characters.', + 'registration:invalidchars' => 'Sorry, your username contains the following invalid character: %s. All of these characters are invalid: %s', 'registration:emailnotvalid' => 'Sorry, the email address you entered is invalid on this system', 'registration:passwordnotvalid' => 'Sorry, the password you entered is invalid on this system', 'registration:usernamenotvalid' => 'Sorry, the username you entered is invalid on this system', |