mirror of
https://github.com/alchemy-fr/Phraseanet.git
synced 2025-10-23 09:53:15 +00:00
fix conf timeout and patch geoloc binaries video editor
This commit is contained in:
@@ -17,7 +17,7 @@ class Version
|
||||
* @var string
|
||||
*/
|
||||
|
||||
private $number = '4.1.0-alpha.27a';
|
||||
private $number = '4.1.0-alpha.28a';
|
||||
|
||||
/**
|
||||
* @var string
|
||||
|
@@ -198,7 +198,7 @@ class Installer
|
||||
$config['main']['database']['driver'] = 'pdo_mysql';
|
||||
$config['main']['database']['charset'] = 'UTF8';
|
||||
|
||||
$config['main']['binaries'] = $binaryData;
|
||||
$config['main']['binaries'] = array_merge($config['main']['binaries'], $binaryData);
|
||||
|
||||
$config['servername'] = $serverName;
|
||||
$config['main']['key'] = $this->app['random.medium']->generateString(16);
|
||||
|
Reference in New Issue
Block a user