Skip to content

Commit

Permalink
Bug #13463: Possible fix
Browse files Browse the repository at this point in the history
  • Loading branch information
slusarz committed Sep 1, 2014
1 parent 85eda5c commit 0688cd5
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions framework/Core/lib/Horde/Core/Factory/Db.php
Expand Up @@ -176,10 +176,6 @@ protected function _createDb($config, $sig = null, $cache = true)
}

$ob = new $class($config);

if (!isset($config['logger'])) {
$ob->setLogger($this->_injector->getInstance('Horde_Log_Logger'));
}
}

if ($sig) {
Expand All @@ -192,6 +188,12 @@ protected function _createDb($config, $sig = null, $cache = true)
$ob->setCache($this->_injector->getInstance('Horde_Cache'));
}

/* Bug #13463: setting logger before cache causes intermittent issues
* with DB object during session shutdown. */
if (!isset($config['logger'])) {
$ob->setLogger($this->_injector->getInstance('Horde_Log_Logger'));
}

return $ob;
}

Expand Down

0 comments on commit 0688cd5

Please sign in to comment.