diff options
| author | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-12-07 20:58:34 +0100 |
|---|---|---|
| committer | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-12-07 20:58:34 +0100 |
| commit | 5285f22442fa3117429b974767aa998cffa423bd (patch) | |
| tree | d7660cf466c51d8fc7970620fca2e39ecc4c20dc /phpBB | |
| parent | a740befb029cdf7dfc97b1339b69805e211ac572 (diff) | |
| parent | 41b4fee6557c34d9ff534e7c1693d4e84e166ce1 (diff) | |
| download | forums-5285f22442fa3117429b974767aa998cffa423bd.tar forums-5285f22442fa3117429b974767aa998cffa423bd.tar.gz forums-5285f22442fa3117429b974767aa998cffa423bd.tar.bz2 forums-5285f22442fa3117429b974767aa998cffa423bd.tar.xz forums-5285f22442fa3117429b974767aa998cffa423bd.zip | |
Merge pull request #4067 from marc1706/ticket/14345
[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
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/phpbb/install/helper/iohandler/cli_iohandler.php | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/phpBB/phpbb/install/helper/iohandler/cli_iohandler.php b/phpBB/phpbb/install/helper/iohandler/cli_iohandler.php index abdd730d2e..4d0341ef12 100644 --- a/phpBB/phpbb/install/helper/iohandler/cli_iohandler.php +++ b/phpBB/phpbb/install/helper/iohandler/cli_iohandler.php @@ -126,7 +126,8 @@ class cli_iohandler extends iohandler_base $this->io->newLine(); $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) { @@ -143,7 +144,8 @@ class cli_iohandler extends iohandler_base $this->io->newLine(); $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) { @@ -172,7 +174,8 @@ class cli_iohandler extends iohandler_base $this->io->newLine(); $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) { |