makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-19 17:58:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop-ascraeus' into develop

Browse source 
* develop-ascraeus:
  [ticket/12475] Error in db:update console command
  [ticket/12474] Error messages should be displayed with <error> tag
This commit is contained in:
Andreas Fischer 2014-05-02 19:50:16 +02:00
commit 237ae5dfae
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
phpBB/phpbb/console/command/db/migrate.php
View file

@ -65,7 +65,7 @@ class migrate extends \phpbb\console\command\command
} }
catch (\phpbb\db\migration\exception $e) catch (\phpbb\db\migration\exception $e)
{ {
$output->writeln($e->getLocalisedMessage($this->user)); $output->writeln('<error>' . $e->getLocalisedMessage($this->user) . '</error>');
$this->finalise_update(); $this->finalise_update();
return 1; return 1;
} }
@ -103,7 +103,7 @@ class migrate extends \phpbb\console\command\command
if ($orig_version != $this->config['version']) if ($orig_version != $this->config['version'])
{ {
$log->add('admin', 'LOG_UPDATE_DATABASE', $orig_version, $this->config['version']); $this->log->add('admin', 'LOG_UPDATE_DATABASE', $orig_version, $this->config['version']);
} }
$this->finalise_update(); $this->finalise_update();