diff options
| author | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-12-08 19:45:43 +0100 |
|---|---|---|
| committer | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-12-08 19:45:43 +0100 |
| commit | 9130f20cb650a8ea244cf258fd579d2b208be311 (patch) | |
| tree | cce446f9781dbb6475cb7e94e1343be8f6c950dc | |
| parent | 398590b7ab6c9f620a4b2d73fd64899be5c9afc3 (diff) | |
| parent | 6188a8777950ffeaa80593d815600c84911ac932 (diff) | |
| download | forums-9130f20cb650a8ea244cf258fd579d2b208be311.tar forums-9130f20cb650a8ea244cf258fd579d2b208be311.tar.gz forums-9130f20cb650a8ea244cf258fd579d2b208be311.tar.bz2 forums-9130f20cb650a8ea244cf258fd579d2b208be311.tar.xz forums-9130f20cb650a8ea244cf258fd579d2b208be311.zip | |
Merge pull request #4072 from marc1706/ticket/14344
[ticket/14344] Improve output of HTML errors trigged during install
* marc1706/ticket/14344:
[ticket/14344] Improve output of HTML errors trigged during install
| -rw-r--r-- | phpBB/phpbb/install/helper/iohandler/cli_iohandler.php | 4 | ||||
| -rw-r--r-- | phpBB/phpbb/install/helper/iohandler/iohandler_base.php | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/phpBB/phpbb/install/helper/iohandler/cli_iohandler.php b/phpBB/phpbb/install/helper/iohandler/cli_iohandler.php index 4d0341ef12..89f3594378 100644 --- a/phpBB/phpbb/install/helper/iohandler/cli_iohandler.php +++ b/phpBB/phpbb/install/helper/iohandler/cli_iohandler.php @@ -125,6 +125,10 @@ class cli_iohandler extends iohandler_base { $this->io->newLine(); + if (strpos($error_title, '<br />') !== false) + { + $error_title = strip_tags(str_replace('<br />', "\n", $error_title)); + } $message = $this->translate_message($error_title, $error_description); $message_string = $message['title'] . (!empty($message['description']) ? "\n" . $message['description'] : ''); $this->io->error($message_string); diff --git a/phpBB/phpbb/install/helper/iohandler/iohandler_base.php b/phpBB/phpbb/install/helper/iohandler/iohandler_base.php index 530cb4766b..8dee5390a9 100644 --- a/phpBB/phpbb/install/helper/iohandler/iohandler_base.php +++ b/phpBB/phpbb/install/helper/iohandler/iohandler_base.php @@ -101,6 +101,10 @@ abstract class iohandler_base implements iohandler_interface */ public function add_error_message($error_title, $error_description = false) { + if (strpos($error_title, '<br />') !== false) + { + $error_title = strip_tags(htmlspecialchars_decode($error_title)); + } $this->errors[] = $this->translate_message($error_title, $error_description); } |