Merge branch 'develop-ascraeus' into develop

* develop-ascraeus:
  [ticket/12909] Use correct lang vars in cli extension enable
This commit is contained in:
Andreas Fischer 2014-08-03 17:52:24 +02:00
commit 05e54d1ebb

View file

@ -40,12 +40,12 @@ class enable extends command
if ($this->manager->is_enabled($name)) if ($this->manager->is_enabled($name))
{ {
$this->log->add('admin', ANONYMOUS, '', 'LOG_EXT_ENABLE', time(), array($name)); $this->log->add('admin', ANONYMOUS, '', 'LOG_EXT_ENABLE', time(), array($name));
$output->writeln('<error>' . $this->user->lang('CLI_EXTENSION_ENABLE_FAILURE', $name) . '</error>'); $output->writeln('<info>' . $this->user->lang('CLI_EXTENSION_ENABLE_SUCCESS', $name) . '</info>');
return 0; return 0;
} }
else else
{ {
$output->writeln('<info>' . $this->user->lang('CLI_EXTENSION_ENABLE_SUCCESS', $name) . '</info>'); $output->writeln('<error>' . $this->user->lang('CLI_EXTENSION_ENABLE_FAILURE', $name) . '</error>');
return 1; return 1;
} }
} }