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

Merge pull request #4041 from rxu/ticket/14308

Browse source 
[ticket/14308] Fix multibyte input for installer
This commit is contained in:
Marc Alexander 2015-11-24 21:31:56 +01:00
commit da6fb67703
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -70,7 +70,7 @@ class obtain_admin_data extends \phpbb\install\task_base implements \phpbb\insta
$admin_name = $this->io_handler->get_input('admin_name', '', true); $admin_name = $this->io_handler->get_input('admin_name', '', true);
$admin_pass1 = $this->io_handler->get_input('admin_pass1', '', true); $admin_pass1 = $this->io_handler->get_input('admin_pass1', '', true);
$admin_pass2 = $this->io_handler->get_input('admin_pass2', '', true); $admin_pass2 = $this->io_handler->get_input('admin_pass2', '', true);
$board_email = $this->io_handler->get_input('board_email', ''); $board_email = $this->io_handler->get_input('board_email', '', true);
$admin_data_valid = $this->check_admin_data($admin_name, $admin_pass1, $admin_pass2, $board_email); $admin_data_valid = $this->check_admin_data($admin_name, $admin_pass1, $admin_pass2, $board_email);

8
phpBB/phpbb/install/module/obtain_data/task/obtain_board_data.php
View file

@ -76,8 +76,8 @@ class obtain_board_data extends \phpbb\install\task_base implements \phpbb\insta
{ {
// Board data // Board data
$default_lang = $this->io_handler->get_input('default_lang', ''); $default_lang = $this->io_handler->get_input('default_lang', '');
$board_name = $this->io_handler->get_input('board_name', ''); $board_name = $this->io_handler->get_input('board_name', '', true);
$board_desc = $this->io_handler->get_input('board_description', ''); $board_desc = $this->io_handler->get_input('board_description', '', true);
// Check default lang // Check default lang
$langs = $this->language_helper->get_available_languages(); $langs = $this->language_helper->get_available_languages();
@ -116,8 +116,8 @@ class obtain_board_data extends \phpbb\install\task_base implements \phpbb\insta
{ {
if ($use_request_data) if ($use_request_data)
{ {
$board_name = $this->io_handler->get_input('board_name', ''); $board_name = $this->io_handler->get_input('board_name', '', true);
$board_desc = $this->io_handler->get_input('board_description', ''); $board_desc = $this->io_handler->get_input('board_description', '', true);
} }
else else
{ {