mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-07 01:06:48 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop-ascraeus' into develop

Browse Source 
Conflicts:
	phpBB/styles/subsilver2/template/memberlist_email.html
This commit is contained in:
Joas Schilling
2014-11-21 23:26:51 +01:00
parent 655cd3bd3a 0017fad554
commit dd3e440cef
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/phpbb/message/topic_form.php
View File

@@ -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,