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

Merge pull request #4072 from marc1706/ticket/14344

Browse source 
[ticket/14344] Improve output of HTML errors trigged during install

* marc1706/ticket/14344:
  [ticket/14344] Improve output of HTML errors trigged during install
This commit is contained in:
Tristan Darricau 2015-12-08 19:45:43 +01:00
commit 9130f20cb6
2 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
phpBB/phpbb/install/helper/iohandler/cli_iohandler.php
View file

@ -125,6 +125,10 @@ class cli_iohandler extends iohandler_base
{ {
$this->io->newLine(); $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 = $this->translate_message($error_title, $error_description);
$message_string = $message['title'] . (!empty($message['description']) ? "\n" . $message['description'] : ''); $message_string = $message['title'] . (!empty($message['description']) ? "\n" . $message['description'] : '');
$this->io->error($message_string); $this->io->error($message_string);

4
phpBB/phpbb/install/helper/iohandler/iohandler_base.php
View file

@ -101,6 +101,10 @@ abstract class iohandler_base implements iohandler_interface
*/ */
public function add_error_message($error_title, $error_description = false) 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); $this->errors[] = $this->translate_message($error_title, $error_description);
} }