diff options
| author | brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-06-18 20:28:22 +0000 |
|---|---|---|
| committer | brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-06-18 20:28:22 +0000 |
| commit | f2aa2c6980460261f27bf01d3e074aa9b2d4bd5d (patch) | |
| tree | fa970a82dc5871c7cd1496cd2e62eb632ba15dd1 /engine | |
| parent | b62d40b4d21a0cf06c31ca4cb47d5a2523276e2d (diff) | |
| download | elgg-f2aa2c6980460261f27bf01d3e074aa9b2d4bd5d.tar.gz elgg-f2aa2c6980460261f27bf01d3e074aa9b2d4bd5d.tar.bz2 | |
Merging r6497:6499 to trunk.
git-svn-id: http://code.elgg.org/elgg/trunk@6514 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/lib/notification.php | 6 | ||||
| -rw-r--r-- | engine/lib/users.php | 4 |
2 files changed, 5 insertions, 5 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)); } } |