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

Merge

Browse Source
This commit is contained in:
Romain Neutron
2012-03-20 15:52:36 +01:00
parent 4c7f3897bf ad320e2193
commit ffa2ba233e
2 changed files with 3 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
lib/Alchemy/Phrasea/Core/Configuration.php
View File

@@ -82,8 +82,6 @@ class Configuration
{ {
$this->initialize(); $this->initialize();
$cacheService = "Cache\array_cache";
$retrieve_old_credentials = function(\SplFileObject $connexionInc) $retrieve_old_credentials = function(\SplFileObject $connexionInc)
{ {
require $connexionInc->getPathname(); require $connexionInc->getPathname();
@@ -131,29 +129,10 @@ class Configuration
} }
$configs[$env]['phraseanet']['servername'] = $old_parameters['servername']; $configs[$env]['phraseanet']['servername'] = $old_parameters['servername'];
if ($env === 'prod' && isset($configs[$env]['cache']))
{
$configs[$env]["cache"] = $cacheService;
}
if ($env === 'prod' && isset($configs[$env]['opcodecache']))
{
$configs[$env]["opcodecache"] = $cacheService;
}
} }
$this->setConfigurations($configs); $this->setConfigurations($configs);
$services = $this->getServices();
if (isset($services['Orm']["doctrine_prod"]["options"]["cache"]))
{
$services['Orm']["doctrine_prod"]["options"]["cache"]['query']['service'] = $cacheService;
$services['Orm']["doctrine_prod"]["options"]["cache"]['result']['service'] = $cacheService;
$services['Orm']["doctrine_prod"]["options"]["cache"]['metadata']['service'] = $cacheService;
}
$this->setServices($services);
$this->setEnvironnement('prod'); $this->setEnvironnement('prod');
return $this; return $this;

4
lib/classes/patch/3602.class.php
View File

@@ -22,7 +22,7 @@ class patch_3602 implements patchInterface
* *
* @var string * @var string
*/ */
private $release = '3.6.0a2'; private $release = '3.6.0a1';
/** /**
* *
* @var Array * @var Array
@@ -40,7 +40,7 @@ class patch_3602 implements patchInterface
public function require_all_upgrades() public function require_all_upgrades()
{ {
return true; return false;
} }
/** /**