diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-11-21 23:26:51 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-11-21 23:26:51 +0100 |
| commit | dd3e440cefb2fa194feeea2ee998b4858342bb65 (patch) | |
| tree | 3f177250460d10c4331e2f32861656b40ffe9fc1 | |
| parent | 655cd3bd3a826beced340555a87a2eb13d464606 (diff) | |
| parent | 0017fad554ca5dd1ad6ba6910bb12152b99fcbd3 (diff) | |
| download | forums-dd3e440cefb2fa194feeea2ee998b4858342bb65.tar forums-dd3e440cefb2fa194feeea2ee998b4858342bb65.tar.gz forums-dd3e440cefb2fa194feeea2ee998b4858342bb65.tar.bz2 forums-dd3e440cefb2fa194feeea2ee998b4858342bb65.tar.xz forums-dd3e440cefb2fa194feeea2ee998b4858342bb65.zip | |
Merge branch 'develop-ascraeus' into develop
Conflicts:
phpBB/styles/subsilver2/template/memberlist_email.html
| -rw-r--r-- | phpBB/language/en/memberlist.php | 2 | ||||
| -rw-r--r-- | phpBB/phpbb/message/topic_form.php | 2 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/memberlist_email.html | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/language/en/memberlist.php b/phpBB/language/en/memberlist.php index b8c626d331..5605f8f4b5 100644 --- a/phpBB/language/en/memberlist.php +++ b/phpBB/language/en/memberlist.php @@ -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', diff --git a/phpBB/phpbb/message/topic_form.php b/phpBB/phpbb/message/topic_form.php index 1e0f2a1945..174643bb81 100644 --- a/phpBB/phpbb/message/topic_form.php +++ b/phpBB/phpbb/message/topic_form.php @@ -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, diff --git a/phpBB/styles/prosilver/template/memberlist_email.html b/phpBB/styles/prosilver/template/memberlist_email.html index e848844093..1bfd83e3a1 100644 --- a/phpBB/styles/prosilver/template/memberlist_email.html +++ b/phpBB/styles/prosilver/template/memberlist_email.html @@ -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> |