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

Merge pull request #4067 from marc1706/ticket/14345

Browse source 
[ticket/14345] Check if description exists in message ary

* marc1706/ticket/14345:
  [ticket/14345] Move new line to ternary comparison
  [ticket/14345] Check if description exists in message ary
This commit is contained in:
Tristan Darricau 2015-12-07 20:58:34 +01:00
commit 5285f22442
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -126,7 +126,8 @@ class cli_iohandler extends iohandler_base
$this->io->newLine(); $this->io->newLine();
$message = $this->translate_message($error_title, $error_description); $message = $this->translate_message($error_title, $error_description);
$this->io->error($message['title'] . "\n" . $message['description']); $message_string = $message['title'] . (!empty($message['description']) ? "\n" . $message['description'] : '');
$this->io->error($message_string);
if ($this->progress_bar !== null) if ($this->progress_bar !== null)
{ {
@ -143,7 +144,8 @@ class cli_iohandler extends iohandler_base
$this->io->newLine(); $this->io->newLine();
$message = $this->translate_message($warning_title, $warning_description); $message = $this->translate_message($warning_title, $warning_description);
$this->io->warning($message['title'] . "\n" . $message['description']); $message_string = $message['title'] . (!empty($message['description']) ? "\n" . $message['description'] : '');
$this->io->warning($message_string);
if ($this->progress_bar !== null) if ($this->progress_bar !== null)
{ {
@ -172,7 +174,8 @@ class cli_iohandler extends iohandler_base
$this->io->newLine(); $this->io->newLine();
$message = $this->translate_message($error_title, $error_description); $message = $this->translate_message($error_title, $error_description);
$this->io->success($message['title'] . "\n" . $message['description']); $message_string = $message['title'] . (!empty($message['description']) ? "\n" . $message['description'] : '');
$this->io->success($message_string);
if ($this->progress_bar !== null) if ($this->progress_bar !== null)
{ {