diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2015-11-24 21:31:56 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2015-11-24 21:31:56 +0100 |
| commit | da6fb677036f779fcd4de88fe0178fc83e45f15b (patch) | |
| tree | 1c4e32f679a8b01c014e13d60074d202b0579064 | |
| parent | 8a3288e3aa9bdbdd6f2648c841d82edc41147cfd (diff) | |
| parent | c3b9b3ab5bbe475ce7b5368a959786fc64122ad4 (diff) | |
| download | forums-da6fb677036f779fcd4de88fe0178fc83e45f15b.tar forums-da6fb677036f779fcd4de88fe0178fc83e45f15b.tar.gz forums-da6fb677036f779fcd4de88fe0178fc83e45f15b.tar.bz2 forums-da6fb677036f779fcd4de88fe0178fc83e45f15b.tar.xz forums-da6fb677036f779fcd4de88fe0178fc83e45f15b.zip | |
Merge pull request #4041 from rxu/ticket/14308
[ticket/14308] Fix multibyte input for installer
| -rw-r--r-- | phpBB/phpbb/install/module/obtain_data/task/obtain_admin_data.php | 2 | ||||
| -rw-r--r-- | phpBB/phpbb/install/module/obtain_data/task/obtain_board_data.php | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/phpBB/phpbb/install/module/obtain_data/task/obtain_admin_data.php b/phpBB/phpbb/install/module/obtain_data/task/obtain_admin_data.php index 41616e995a..ac305e8ab5 100644 --- a/phpBB/phpbb/install/module/obtain_data/task/obtain_admin_data.php +++ b/phpBB/phpbb/install/module/obtain_data/task/obtain_admin_data.php @@ -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_pass1 = $this->io_handler->get_input('admin_pass1', '', 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); diff --git a/phpBB/phpbb/install/module/obtain_data/task/obtain_board_data.php b/phpBB/phpbb/install/module/obtain_data/task/obtain_board_data.php index 4e977981ce..6c54561d14 100644 --- a/phpBB/phpbb/install/module/obtain_data/task/obtain_board_data.php +++ b/phpBB/phpbb/install/module/obtain_data/task/obtain_board_data.php @@ -76,8 +76,8 @@ class obtain_board_data extends \phpbb\install\task_base implements \phpbb\insta { // Board data $default_lang = $this->io_handler->get_input('default_lang', ''); - $board_name = $this->io_handler->get_input('board_name', ''); - $board_desc = $this->io_handler->get_input('board_description', ''); + $board_name = $this->io_handler->get_input('board_name', '', true); + $board_desc = $this->io_handler->get_input('board_description', '', true); // Check default lang $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) { - $board_name = $this->io_handler->get_input('board_name', ''); - $board_desc = $this->io_handler->get_input('board_description', ''); + $board_name = $this->io_handler->get_input('board_name', '', true); + $board_desc = $this->io_handler->get_input('board_description', '', true); } else { |