diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-05-30 22:52:14 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-05-30 22:52:14 +0200 |
| commit | ee8e5bcf371bc17ee4d65672658e4fe8ea377b07 (patch) | |
| tree | dcb05d359271cd10dbeb6a39e300a0d750afed1a /phpBB/phpbb | |
| parent | 64f81636525c72958e0a770f640b403386f12c68 (diff) | |
| parent | a6a2d1bc2d85157bdd1e79fd5c853b30eeccd02d (diff) | |
| download | forums-ee8e5bcf371bc17ee4d65672658e4fe8ea377b07.tar forums-ee8e5bcf371bc17ee4d65672658e4fe8ea377b07.tar.gz forums-ee8e5bcf371bc17ee4d65672658e4fe8ea377b07.tar.bz2 forums-ee8e5bcf371bc17ee4d65672658e4fe8ea377b07.tar.xz forums-ee8e5bcf371bc17ee4d65672658e4fe8ea377b07.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/12597] Update USE_SYSTEM_CRON_EXPLAIN to be a bit more verbose.
[ticket/12597] Improve language for cron:run command.
[ticket/12597] Do not output anything besides the gif image.
Diffstat (limited to 'phpBB/phpbb')
| -rw-r--r-- | phpBB/phpbb/console/command/cron/run.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/phpbb/console/command/cron/run.php b/phpBB/phpbb/console/command/cron/run.php index f76fb30e3b..1029a2e085 100644 --- a/phpBB/phpbb/console/command/cron/run.php +++ b/phpBB/phpbb/console/command/cron/run.php @@ -3,7 +3,7 @@ * * This file is part of the phpBB Forum Software package. * -* @copyright (c) phpBB Limited +* @copyright (c) phpBB Limited * @license GNU General Public License, version 2 (GPL-2.0) * * For full copyright and license information, please see @@ -67,7 +67,7 @@ class run extends \phpbb\console\command\command * and the exit status is set to 1. * If the verbose option is specified, each start of a task is printed. * Otherwise there is no output. - * If an argument is given to the command, only the task whose name matches the + * If an argument is given to the command, only the task whose name matches the * argument will be started. If verbose option is specified, * an info message containing the name of the task is printed. * If no task matches the argument given, an error message is printed @@ -169,7 +169,7 @@ class run extends \phpbb\console\command\command } else { - $output->writeln('<error>' . $this->user->lang('CRON_NO_SUCH_TASK') . '</error>'); + $output->writeln('<error>' . $this->user->lang('CRON_NO_SUCH_TASK', $task_name) . '</error>'); return 2; } } |