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

Fix upgrade

Browse Source
This commit is contained in:
Romain Neutron
2013-06-11 15:59:48 +02:00
parent 43d55e20ed
commit f1a53d2b68
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/classes/patch/3807.php
View File

@@ -139,9 +139,11 @@ class patch_3807 implements patchInterface
private function migrateConnexions(array &$conf) private function migrateConnexions(array &$conf)
{ {
$data = $this->yaml->parse($this->connexionsYaml); if (is_file($this->connexionsYaml)) {
$data = $this->yaml->parse($this->connexionsYaml);
$conf['main']['database'] = $data['main_connexion']; $conf['main']['database'] = $data['main_connexion'];
$conf['main']['database-test'] = $data['test_connexion']; $conf['main']['database-test'] = $data['test_connexion'];
}
} }
} }

8
lib/conf.d/configuration.yml
View File

@@ -2,11 +2,11 @@ main:
servername: 'http://local.phrasea/' servername: 'http://local.phrasea/'
maintenance: false maintenance: false
database: database:
host: 127.0.0.1 host: 'sql-host'
port: '3306' port: '3306'
user: root user: 'sql-user'
password: '' password: 'sql-password'
dbname: ab_test dbname: ab_phraseanet
driver: pdo_mysql driver: pdo_mysql
charset: UTF8 charset: UTF8
database-test: database-test: