diff options
| author | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-11-23 22:01:07 +0100 |
|---|---|---|
| committer | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-11-23 22:01:07 +0100 |
| commit | 30e01a9e4b91865a32a9afc4e5d4deb9bb9a933b (patch) | |
| tree | 7a41bfee88680b17447d8c526b9fc14b7d742341 /phpBB/phpbb | |
| parent | 75e9b2a18d0ae8531e056bdd2c7feb6739ef011e (diff) | |
| parent | a6acbc445e58bbc42080f5c77c0671a5c9c01060 (diff) | |
| download | forums-30e01a9e4b91865a32a9afc4e5d4deb9bb9a933b.tar forums-30e01a9e4b91865a32a9afc4e5d4deb9bb9a933b.tar.gz forums-30e01a9e4b91865a32a9afc4e5d4deb9bb9a933b.tar.bz2 forums-30e01a9e4b91865a32a9afc4e5d4deb9bb9a933b.tar.xz forums-30e01a9e4b91865a32a9afc4e5d4deb9bb9a933b.zip | |
Merge pull request #4026 from marc1706/ticket/14281
[ticket/14281] Fix installer CLI after recent changes
* marc1706/ticket/14281:
[ticket/14281] Add install/phpbbcli.php to executable files list
[ticket/14281] Correctly pass parameters to add_error_message
[ticket/14281] Fix installer CLI after recent changes
Diffstat (limited to 'phpBB/phpbb')
| -rw-r--r-- | phpBB/phpbb/install/console/command/install/config/show.php | 2 | ||||
| -rw-r--r-- | phpBB/phpbb/install/console/command/install/install.php | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/phpbb/install/console/command/install/config/show.php b/phpBB/phpbb/install/console/command/install/config/show.php index 4155440fc3..5d82d8d1ef 100644 --- a/phpBB/phpbb/install/console/command/install/config/show.php +++ b/phpBB/phpbb/install/console/command/install/config/show.php @@ -96,7 +96,7 @@ class show extends \phpbb\console\command\command if (!is_file($config_file)) { - $iohandler->add_error_message(array('MISSING_FILE', array($config_file))); + $iohandler->add_error_message(array('MISSING_FILE', $config_file)); return; } diff --git a/phpBB/phpbb/install/console/command/install/install.php b/phpBB/phpbb/install/console/command/install/install.php index 81ad1039f6..d76182af92 100644 --- a/phpBB/phpbb/install/console/command/install/install.php +++ b/phpBB/phpbb/install/console/command/install/install.php @@ -116,7 +116,7 @@ class install extends \phpbb\console\command\command if (!is_file($config_file)) { - $iohandler->add_error_message(array('MISSING_FILE', array($config_file))); + $iohandler->add_error_message(array('MISSING_FILE', $config_file)); return 1; } @@ -127,7 +127,7 @@ class install extends \phpbb\console\command\command } catch (ParseException $e) { - $iohandler->add_error_message('INVALID_YAML_FILE'); + $iohandler->add_error_message(array('INVALID_YAML_FILE', $config_file)); return 1; } |