makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 04:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '3.2.x'

Browse source 
* 3.2.x:
  [ticket/15015] Use correct explain string for enable email settings
This commit is contained in:
Tristan Darricau 2017-01-22 23:06:53 +01:00
commit 34866b2db1
No known key found for this signature in database
GPG key ID: 817043C2E29DB881
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/phpbb/install/module/obtain_data/task/obtain_email_data.php
View file

@ -84,7 +84,7 @@ class obtain_email_data extends \phpbb\install\task_base implements \phpbb\insta
$email_form = array(
'email_enable' => array(
'label' => 'ENABLE_EMAIL',
'description' => 'COOKIE_SECURE_EXPLAIN',
'description' => 'ENABLE_EMAIL_EXPLAIN',
'type' => 'radio',
'options' => array(
array(