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

replace connexion.inc & replace servername

Browse Source
This commit is contained in:
Nicolas Le Goff
2012-01-03 14:47:56 +01:00
parent 8a73c310eb
commit cc05ba9ac6
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/classes/registry.class.php
View File

@@ -23,6 +23,7 @@ class registry implements registryInterface
* @var cache_opcode_adapter
*/
protected $cache;
/**
*
* @var registry
@@ -57,11 +58,15 @@ class registry implements registryInterface
{
$this->cache = $cache;
require __DIR__ . '/../../config/config.inc';
$handler = new \Alchemy\Phrasea\Core\Configuration\Handler(
new \Alchemy\Phrasea\Core\Configuration\Application(),
new \Alchemy\Phrasea\Core\Configuration\Parser\Yaml()
);
$configuration = new \Alchemy\Phrasea\Core\Configuration($handler);
$this->cache->set('GV_RootPath', dirname(dirname(__DIR__)) . '/');
$this->cache->set('GV_ServerName', p4string::addEndSlash($servername));
$this->cache->set('GV_debug', !!$debug);
$this->cache->set('GV_maintenance', !!$maintenance);
$this->cache->set('GV_debug', $configuration->isDebug());
$this->cache->set('GV_maintenance', $configuration->isMaintained());
return $this;
}
@@ -88,7 +93,7 @@ class registry implements registryInterface
}
catch (Exception $e)
{
}
foreach ($rs as $row)
{
@@ -130,7 +135,7 @@ class registry implements registryInterface
if (!$this->cache->is_set($key))
$this->load();
if(!$this->cache->is_set($key) && !is_null($defaultvalue))
if (!$this->cache->is_set($key) && !is_null($defaultvalue))
return $defaultvalue;
else
return $this->cache->get($key);