diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2015-04-22 14:01:20 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2015-04-22 14:01:20 +0200 |
| commit | 6381c5a7310e2046fc3e4d1755b20b75a321b8e9 (patch) | |
| tree | 3edd96d086593f45bc5adacb8d7bba682dc8fe67 /phpBB/phpbb | |
| parent | ecc65f564d9f966a4d5b0f22281024f49cc8b22b (diff) | |
| parent | de5a5c41f8e8e47d0740fa97d3d83d57168b18b4 (diff) | |
| download | forums-6381c5a7310e2046fc3e4d1755b20b75a321b8e9.tar forums-6381c5a7310e2046fc3e4d1755b20b75a321b8e9.tar.gz forums-6381c5a7310e2046fc3e4d1755b20b75a321b8e9.tar.bz2 forums-6381c5a7310e2046fc3e4d1755b20b75a321b8e9.tar.xz forums-6381c5a7310e2046fc3e4d1755b20b75a321b8e9.zip | |
Merge pull request #3544 from Nicofuma/ticket/13768
[ticket/13768] Update to symfony 2.8.*@dev
* Nicofuma/ticket/13768:
[ticket/13768] Fix deprecations
[ticket/13768] Update to symfony 2.8.*@dev
Diffstat (limited to 'phpBB/phpbb')
| -rw-r--r-- | phpBB/phpbb/di/container_builder.php | 2 | ||||
| -rw-r--r-- | phpBB/phpbb/routing/router.php | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/phpbb/di/container_builder.php b/phpBB/phpbb/di/container_builder.php index 2a410db9bd..99576f9020 100644 --- a/phpBB/phpbb/di/container_builder.php +++ b/phpBB/phpbb/di/container_builder.php @@ -150,7 +150,7 @@ class container_builder $config_cache = new ConfigCache($container_filename, defined('DEBUG')); if ($this->dump_container && $config_cache->isFresh()) { - require($container_filename); + require($config_cache->getPath()); $this->container = new \phpbb_cache_container(); } else diff --git a/phpBB/phpbb/routing/router.php b/phpBB/phpbb/routing/router.php index 5313106b0a..7444f06253 100644 --- a/phpBB/phpbb/routing/router.php +++ b/phpBB/phpbb/routing/router.php @@ -262,7 +262,7 @@ class router implements RouterInterface $cache->write($dumper->dump($options), $this->get_routes()->getResources()); } - require_once($cache); + require_once($cache->getPath()); $this->matcher = new \phpbb_url_matcher($this->context); } @@ -310,7 +310,7 @@ class router implements RouterInterface $cache->write($dumper->dump($options), $this->get_routes()->getResources()); } - require_once($cache); + require_once($cache->getPath()); $this->generator = new \phpbb_url_generator($this->context); } |