aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/install
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2015-12-07 13:53:44 +0100
committerMarc Alexander <admin@m-a-styles.de>2015-12-07 13:53:44 +0100
commit1b9ae803c5cf887c8acc2e7580ccb6fe76522d58 (patch)
tree01896e7825f00ff799b6e7a9221917eb57660f3a /phpBB/phpbb/install
parenta740befb029cdf7dfc97b1339b69805e211ac572 (diff)
downloadforums-1b9ae803c5cf887c8acc2e7580ccb6fe76522d58.tar
forums-1b9ae803c5cf887c8acc2e7580ccb6fe76522d58.tar.gz
forums-1b9ae803c5cf887c8acc2e7580ccb6fe76522d58.tar.bz2
forums-1b9ae803c5cf887c8acc2e7580ccb6fe76522d58.tar.xz
forums-1b9ae803c5cf887c8acc2e7580ccb6fe76522d58.zip
[ticket/14345] Check if description exists in message ary
PHPBB3-14345
Diffstat (limited to 'phpBB/phpbb/install')
-rw-r--r--phpBB/phpbb/install/helper/iohandler/cli_iohandler.php9
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..dae5d339a5 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'] . "\n" . (!empty($message['description']) ? $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'] . "\n" . (!empty($message['description']) ? $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'] . "\n" . (!empty($message['description']) ? $message['description'] : '');
+ $this->io->success($message_string);
if ($this->progress_bar !== null)
{