diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2015-12-07 23:36:49 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2015-12-07 23:36:49 +0100 |
| commit | 6188a8777950ffeaa80593d815600c84911ac932 (patch) | |
| tree | bb1f0565f82d381d026f5e86dc8a2092942c54c7 /phpBB/phpbb/install | |
| parent | f14a9b70694ef1ff575e7db46fdcdec8c9bc87e4 (diff) | |
| download | forums-6188a8777950ffeaa80593d815600c84911ac932.tar forums-6188a8777950ffeaa80593d815600c84911ac932.tar.gz forums-6188a8777950ffeaa80593d815600c84911ac932.tar.bz2 forums-6188a8777950ffeaa80593d815600c84911ac932.tar.xz forums-6188a8777950ffeaa80593d815600c84911ac932.zip | |
[ticket/14344] Improve output of HTML errors trigged during install
PHPBB3-14344
Diffstat (limited to 'phpBB/phpbb/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); } |