From b32dc8c667b58e6cf6c481af734c8677d7211047 Mon Sep 17 00:00:00 2001
From: Oliver Schramm <oliver.schramm97@gmail.com>
Date: Tue, 4 Nov 2014 18:22:46 +0100
Subject: [PATCH 1/2] [ticket/13284] Fix request name so users can cc
 themselves

PHPBB3-13284
---
 phpBB/language/en/memberlist.php                       | 2 +-
 phpBB/styles/prosilver/template/memberlist_email.html  | 2 +-
 phpBB/styles/subsilver2/template/memberlist_email.html | 4 ++--
 3 files changed, 4 insertions(+), 4 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/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>&nbsp;</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>
diff --git a/phpBB/styles/subsilver2/template/memberlist_email.html b/phpBB/styles/subsilver2/template/memberlist_email.html
index b52513c241..1416aa0c10 100644
--- a/phpBB/styles/subsilver2/template/memberlist_email.html
+++ b/phpBB/styles/subsilver2/template/memberlist_email.html
@@ -72,8 +72,8 @@
 		<td class="row2">
 			<table cellspacing="0" cellpadding="1" border="0">
 			<tr>
-				<td><input type="checkbox" class="radio" name="cc_email" value="1" checked="checked" /></td>
-				<td class="gen">{L_CC_EMAIL}</td>
+				<td><input type="checkbox" class="radio" name="cc_sender" value="1" checked="checked" /></td>
+				<td class="gen">{L_CC_SENDER}</td>
 			</tr>
 			</table>
 		</td>

From 32010de36ef81a32e17943d8b4b7a755d71ea691 Mon Sep 17 00:00:00 2001
From: Oliver Schramm <oliver.schramm97@gmail.com>
Date: Tue, 4 Nov 2014 18:33:59 +0100
Subject: [PATCH 2/2] [ticket/13284] Set message body in topic form too, so it
 will be sent

PHPBB3-13284
---
 phpBB/phpbb/message/topic_form.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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,