summaryrefslogtreecommitdiffstats
path: root/lib/private/appframework/dependencyinjection
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2013-10-16 06:42:09 -0700
committerThomas Müller <thomas.mueller@tmit.eu>2013-10-16 06:42:09 -0700
commitc3f7d22adc59949ad41c33d450b6d3e226cdefdb (patch)
tree07a528f19ee2aff7a0bd8cadb89de4b9851d5cbf /lib/private/appframework/dependencyinjection
parentdb31541fe13510ca4d1b752d7ac5a08ea8e89310 (diff)
parent8603f956ab5982251de51ea403ee93c840a987ac (diff)
downloadnextcloud-server-c3f7d22adc59949ad41c33d450b6d3e226cdefdb.tar.gz
nextcloud-server-c3f7d22adc59949ad41c33d450b6d3e226cdefdb.zip
Merge pull request #5067 from owncloud/urlParams_fix
Get urlParams registered before Request is instantiated
Diffstat (limited to 'lib/private/appframework/dependencyinjection')
-rw-r--r--lib/private/appframework/dependencyinjection/dicontainer.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/private/appframework/dependencyinjection/dicontainer.php b/lib/private/appframework/dependencyinjection/dicontainer.php
index e62b72fd973..523a4153e01 100644
--- a/lib/private/appframework/dependencyinjection/dicontainer.php
+++ b/lib/private/appframework/dependencyinjection/dicontainer.php
@@ -49,9 +49,10 @@ class DIContainer extends SimpleContainer implements IAppContainer{
* Put your class dependencies in here
* @param string $appName the name of the app
*/
- public function __construct($appName){
+ public function __construct($appName, $urlParams = array()){
$this['AppName'] = $appName;
+ $this['urlParams'] = $urlParams;
$this->registerParameter('ServerContainer', \OC::$server);
@@ -66,6 +67,7 @@ class DIContainer extends SimpleContainer implements IAppContainer{
/** @var $c SimpleContainer */
/** @var $server IServerContainer */
$server = $c->query('ServerContainer');
+ $server->registerParameter('urlParams', $c['urlParams']);
return $server->getRequest();
});