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
5bdace7e
Commit
5bdace7e
authored
Jun 23, 2009
by
Nigel McNie
Browse files
Replace emailname with the sitename which will surely give more context.
parent
44ed76ac
Changes
2
Show whitespace changes
Inline
Side-by-side
htdocs/lang/en.utf8/mahara.php
View file @
5bdace7e
...
...
@@ -483,8 +483,6 @@ $string['institutionmemberconfirmmessage'] = 'You have been added as a member of
$string
[
'institutionmemberrejectsubject'
]
=
'Institution membership request declined'
;
$string
[
'institutionmemberrejectmessage'
]
=
'Your request for membership of %s was declined.'
;
$string
[
'emailname'
]
=
'Mahara System'
;
// robot!
$string
[
'config'
]
=
'Config'
;
$string
[
'sendmessage'
]
=
'Send message'
;
...
...
htdocs/lib/user.php
View file @
5bdace7e
...
...
@@ -311,7 +311,7 @@ function email_user($userto, $userfrom, $subject, $messagetext, $messagehtml='',
if
(
empty
(
$userfrom
))
{
$mail
->
Sender
=
get_config
(
'noreplyaddress'
);
$mail
->
From
=
$mail
->
Sender
;
$mail
->
FromName
=
get_
string
(
'email
name'
);
$mail
->
FromName
=
get_
config
(
'site
name'
);
$customheaders
[]
=
'Precedence: Bulk'
;
// Try to avoid pesky out of office responses
$messagetext
.
=
"
\n\n
"
.
get_string
(
'pleasedonotreplytothismessage'
)
.
"
\n
"
;
if
(
$messagehtml
)
{
...
...
Write
Preview
Supports
Markdown
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