File: phpbb/di/container_builder.php
Unmodified
Added
Modified
Removed
| Line 185 | Line 185 |
|---|
}
$this->container->set('config.php', $this->config_php_file);
|
}
$this->container->set('config.php', $this->config_php_file);
|
| | $this->inject_dbal_driver();
|
if ($this->compile_container)
{
|
if ($this->compile_container)
{
|
| Line 300 | Line 301 |
|---|
if ($this->dbal_connection !== null)
{
$this->container->get('dbal.conn')->set_driver($this->dbal_connection);
|
if ($this->dbal_connection !== null)
{
$this->container->get('dbal.conn')->set_driver($this->dbal_connection);
|
| | }
}
/**
* Inject the dbal connection driver into container
*/
protected function inject_dbal_driver()
{
$config_data = $this->config_php_file->get_all();
if (!empty($config_data))
{
$this->container->set('dbal.conn.driver', $this->get_dbal_connection());
|
}
}
| }
}
|
| Line 320 | Line 333 |
|---|
$this->config_php_file->get('dbpasswd'),
$this->config_php_file->get('dbname'),
$this->config_php_file->get('dbport'),
|
$this->config_php_file->get('dbpasswd'),
$this->config_php_file->get('dbname'),
$this->config_php_file->get('dbport'),
|
| | false,
|
defined('PHPBB_DB_NEW_LINK') && PHPBB_DB_NEW_LINK
);
}
| defined('PHPBB_DB_NEW_LINK') && PHPBB_DB_NEW_LINK
);
}
|
| Line 399 | Line 413 |
|---|
*/
protected function get_container_filename()
{
|
*/
protected function get_container_filename()
{
|
$filename = str_replace(array('/', '.'), array('slash', 'dot'), $this->phpbb_root_path);
return $this->phpbb_root_path . 'cache/container_' . $filename . '.' . $this->php_ext;
| return $this->phpbb_root_path . 'cache/container_' . md5($this->phpbb_root_path) . '.' . $this->php_ext;
|
}
}
| }
}
|
