diff --git a/core/lib/Thelia/Core/Thelia.php b/core/lib/Thelia/Core/Thelia.php index 6008939fb..63366c208 100755 --- a/core/lib/Thelia/Core/Thelia.php +++ b/core/lib/Thelia/Core/Thelia.php @@ -71,34 +71,6 @@ class Thelia extends Kernel return ; } -/* if (! Propel::isInit()) { - - $definePropel = new DefinePropel(new DatabaseConfiguration(), - Yaml::parse(THELIA_ROOT . '/local/config/database.yml')); - - Propel::setConfiguration($definePropel->getConfig()); - - if ($this->isDebug()) { - Propel::setLogger(Tlog::getInstance()); - $config = Propel::getConfiguration(PropelConfiguration::TYPE_OBJECT); - $config->setParameter('debugpdo.logging.methods', array( - 'PropelPDO::exec', - 'PropelPDO::query', - 'PropelPDO::prepare', - 'DebugPDOStatement::execute', - ), false); - $config->setParameter('debugpdo.logging.details', array( - 'time' => array('enabled' => true), - 'mem' => array('enabled' => true), - 'connection' => array('enabled' => true), - )); - $con = Propel::getConnection("thelia"); - $con->useDebug(true); - } - - Propel::initialize(); - }*/ - $definePropel = new DefinePropel(new DatabaseConfiguration(), Yaml::parse(THELIA_ROOT . '/local/config/database.yml')); $propelConfig = $definePropel->getConfig(); diff --git a/core/lib/Thelia/Tests/Log/TlogTest.php b/core/lib/Thelia/Tests/Log/TlogTest.php index 14518e5ce..acae68dc6 100755 --- a/core/lib/Thelia/Tests/Log/TlogTest.php +++ b/core/lib/Thelia/Tests/Log/TlogTest.php @@ -33,9 +33,7 @@ class TlogTest extends \PHPUnit_Framework_TestCase public static function setUpBeforeClass() { - if (!\Propel::isInit()){ - \Propel::init(THELIA_ROOT . "/local/config/config_thelia.php"); - } + self::$logger = Tlog::getInstance();