hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-18 07:23:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix latest merge

Browse Source
This commit is contained in:
Romain Neutron
2013-10-03 16:41:59 +02:00
parent 1dfbff5666
commit 5ceaa35717
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/classes/module/console/systemUpgrade.php
View File

@@ -66,12 +66,12 @@ class module_console_systemUpgrade extends Command
if ($continue == 'y') { if ($continue == 'y') {
$output->write('<info>Upgrading...</info>', true); $output->write('<info>Upgrading...</info>', true);
if (count(User_Adapter::get_wrong_email_users($this->container)) > 0) { try {
$upgrader = new Setup_Upgrade($this->container, $input->getOption('force'));
} catch (\Exception_Setup_FixBadEmailAddresses $e) {
return $output->writeln(sprintf('<error>You have to fix your database before upgrade with the system:mailCheck command </error>')); return $output->writeln(sprintf('<error>You have to fix your database before upgrade with the system:mailCheck command </error>'));
} }
$upgrader = new Setup_Upgrade($this->container, $input->getOption('force'));
$queries = $this->getService('phraseanet.appbox')->forceUpgrade($upgrader, $this->container); $queries = $this->getService('phraseanet.appbox')->forceUpgrade($upgrader, $this->container);
if ($input->getOption('dump')) { if ($input->getOption('dump')) {