aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorTristan Darricau <github@nicofuma.fr>2014-10-04 17:47:36 +0200
committerTristan Darricau <github@nicofuma.fr>2014-11-20 20:59:55 +0100
commit0b61e3540de353f2bf0a6904a87727e4efe9c5fa (patch)
treed1c30153a8e82858a3ee838c93db496e868c74db /phpBB
parent3a167aa0c3eaec6c4b9d322460480786234e0419 (diff)
downloadforums-0b61e3540de353f2bf0a6904a87727e4efe9c5fa.tar
forums-0b61e3540de353f2bf0a6904a87727e4efe9c5fa.tar.gz
forums-0b61e3540de353f2bf0a6904a87727e4efe9c5fa.tar.bz2
forums-0b61e3540de353f2bf0a6904a87727e4efe9c5fa.tar.xz
forums-0b61e3540de353f2bf0a6904a87727e4efe9c5fa.zip
[ticket/12620] Fix tests
PHPBB3-12620
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/phpbb/di/container_builder.php16
1 files changed, 16 insertions, 0 deletions
diff --git a/phpBB/phpbb/di/container_builder.php b/phpBB/phpbb/di/container_builder.php
index 5ad9336695..6216dad978 100644
--- a/phpBB/phpbb/di/container_builder.php
+++ b/phpBB/phpbb/di/container_builder.php
@@ -195,6 +195,8 @@ class container_builder
$loader = new YamlFileLoader($this->container, new FileLocator(phpbb_realpath($this->get_config_path())));
$loader->load(PHPBB_ENVIRONMENT . '/config.yml');
+ $this->inject_custom_parameters();
+
if ($this->compile_container)
{
$this->container->compile();
@@ -431,6 +433,20 @@ class container_builder
}
/**
+ * Inject the customs parameters into the container
+ */
+ protected function inject_custom_parameters()
+ {
+ if ($this->custom_parameters !== null)
+ {
+ foreach ($this->custom_parameters as $key => $value)
+ {
+ $this->container->setParameter($key, $value);
+ }
+ }
+ }
+
+ /**
* Returns the core parameters.
*
* @return array An array of core parameters
bootlook.pm?h=V9_1_24mdk&id=e1d6f9cd306061cd1d6d03ecc336e06d315660fd'>e1d6f9cd306061cd1d6d03ecc336e06d315660fd (diff)downloaddrakx-7f7d2c8b9facf43f657214501cfe0aef8a3a5481.tar
drakx-7f7d2c8b9facf43f657214501cfe0aef8a3a5481.tar.gz
drakx-7f7d2c8b9facf43f657214501cfe0aef8a3a5481.tar.bz2
drakx-7f7d2c8b9facf43f657214501cfe0aef8a3a5481.tar.xz
drakx-7f7d2c8b9facf43f657214501cfe0aef8a3a5481.zip
update copyright years
Diffstat (limited to 'perl-install/bootlook.pm')
-rw-r--r--perl-install/bootlook.pm2
1 files changed, 1 insertions, 1 deletions
diff --git a/perl-install/bootlook.pm b/perl-install/bootlook.pm
index 58cd29cf7..692b560b8 100644
--- a/perl-install/bootlook.pm
+++ b/perl-install/bootlook.pm
@@ -2,7 +2,7 @@
# Control-center
-# Copyright (C) 2001 MandrakeSoft
+# Copyright (C) 2001-2002 MandrakeSoft
# Yves Duret <yduret at mandrakesoft.com>
#
# This program is free software; you can redistribute it and/or modify