Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
mahara
mahara
Commits
78a81da4
Commit
78a81da4
authored
May 02, 2011
by
Richard Mansfield
Committed by
Gerrit Code Review
May 02, 2011
Browse files
Merge "Fix warning when registering an account"
parents
7e530034
3cee55f8
Changes
1
Hide whitespace changes
Inline
Side-by-side
htdocs/lib/user.php
View file @
78a81da4
...
...
@@ -288,7 +288,7 @@ function email_user($userto, $userfrom, $subject, $messagetext, $messagehtml='',
throw
new
InvalidArgumentException
(
"empty user given to email_user"
);
}
if
(
$userto
->
id
&&
empty
(
$userto
->
ignoredisabled
))
{
if
(
isset
(
$userto
->
id
)
&&
empty
(
$userto
->
ignoredisabled
))
{
$maildisabled
=
property_exists
(
$userto
,
'maildisabled'
)
?
$userto
->
maildisabled
:
get_account_preference
(
$userto
->
id
,
'maildisabled'
)
==
1
;
if
(
$maildisabled
)
{
throw
new
EmailDisabledException
(
"email for this user has been disabled"
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment