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

Merge 3.7

Browse Source
This commit is contained in:
Romain Neutron
2012-09-06 14:30:55 +02:00
parent 2dde167b66 78c4cda35e
commit b162057f37
22 changed files with 50027 additions and 41599 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -58,12 +58,12 @@ class module_console_systemUpgrade extends Command
if ($continue == 'y') {
try {
$connexionInc = new \SplFileInfo($old_connexion_file, true);
$configInc = new \SplFileInfo($old_config_file, true);
$connexionInc = new \SplFileInfo($old_connexion_file);
$configInc = new \SplFileInfo($old_config_file);
$Core->getConfiguration()->upgradeFromOldConf($configInc, $connexionInc);
} catch (\Exception $e) {
throw new RuntimeException('Error while upgrading : ' . $e->getMessage());
}
} else {
throw new RuntimeException('Phraseanet is not set up');