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

Fix #901 : allow upgrade from Phraseanet 3.1

Browse Source
This commit is contained in:
Romain Neutron
2012-09-27 12:48:35 +02:00
parent de22e18309
commit e96a861f0a
4 changed files with 94 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/classes/module/console/systemUpgrade.class.php
View File

@@ -45,14 +45,11 @@ class module_console_systemUpgrade extends Command
{
require_once dirname(__FILE__) . '/../../../../lib/bootstrap.php';
$old_connexion_file = __DIR__ . '/../../../../config/connexion.inc';
$old_config_file = __DIR__ . '/../../../../config/config.inc';
$interactive = !$input->getOption('yes');
$Core = \bootstrap::getCore();
if (!$Core->getConfiguration()->isInstalled() && file_exists($old_config_file) && file_exists($old_connexion_file)) {
if (!$Core->getConfiguration()->isInstalled() && \setup::needUpgradeConfigurationFile()) {
if ($interactive) {
$output->writeln('This version of Phraseanet requires a config/config.yml, config/connexion.yml, config/service.yml');
@@ -68,8 +65,12 @@ class module_console_systemUpgrade extends Command
if ($continue == 'y') {
try {
$connexionInc = new \SplFileInfo($old_connexion_file);
$configInc = new \SplFileInfo($old_config_file);
if (\setup::requireGVUpgrade()) {
setup::upgradeGV($Core['Registry']);
}
$connexionInc = new \SplFileInfo(__DIR__ . '/../../../../config/connexion.inc');
$configInc = new \SplFileInfo(__DIR__ . '/../../../../config/config.inc');
$Core->getConfiguration()->upgradeFromOldConf($configInc, $connexionInc);
} catch (\Exception $e) {