mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-09 16:05:00 +02:00
Merge branch 'develop-ascraeus' into develop
Conflicts: phpBB/styles/subsilver2/template/memberlist_email.html
This commit is contained in:
commit
dd3e440cef
@ -48,7 +48,7 @@ $lang = array_merge($lang, array(
|
||||
|
||||
'BEFORE' => 'Before',
|
||||
|
||||
'CC_EMAIL' => 'Send a copy of this email to yourself.',
|
||||
'CC_SENDER' => 'Send a copy of this email to yourself.',
|
||||
'CONTACT_ADMIN' => 'Contact a Board Administrator',
|
||||
|
||||
'DEST_LANG' => 'Language',
|
||||
|
@ -117,7 +117,7 @@ class topic_form extends form
|
||||
'TOPIC_NAME' => htmlspecialchars_decode($this->topic_row['topic_title']),
|
||||
'U_TOPIC' => generate_board_url() . '/viewtopic.' . $this->phpEx . '?f=' . $this->topic_row['forum_id'] . '&t=' . $this->topic_id,
|
||||
));
|
||||
|
||||
$this->message->set_body($this->body);
|
||||
$this->message->add_recipient(
|
||||
$this->recipient_name,
|
||||
$this->recipient_address,
|
||||
|
@ -80,7 +80,7 @@
|
||||
<!-- IF S_REGISTERED_USER -->
|
||||
<dl>
|
||||
<dt> </dt>
|
||||
<dd><label for="cc_email"><input type="checkbox" name="cc_email" id="cc_email" value="1" checked="checked" tabindex="5" /> {L_CC_EMAIL}</label></dd>
|
||||
<dd><label for="cc_sender"><input type="checkbox" name="cc_sender" id="cc_sender" value="1" checked="checked" tabindex="5" /> {L_CC_SENDER}</label></dd>
|
||||
</dl>
|
||||
<!-- ENDIF -->
|
||||
</fieldset>
|
||||
|
Loading…
x
Reference in New Issue
Block a user