diff options
| author | Jörn Friedrich Dreyer <jfd@butonic.de> | 2014-01-08 10:28:58 +0400 |
|---|---|---|
| committer | Jörn Friedrich Dreyer <jfd@butonic.de> | 2014-01-08 10:28:58 +0400 |
| commit | f356894aa3f30c12cf4d6da0a98e1c0cd2881865 (patch) | |
| tree | 16b0c426f0e5ab30a4d9b2bb914539f99f8d9727 /lib/private/server.php | |
| parent | a7d0ab96c100a5a94b36bf7b311df02e1606a1d2 (diff) | |
| parent | 6254f0a403e315461f8e20ebccf71cb91e9313a3 (diff) | |
Merge pull request #6594 from owncloud/kill-index.php-from-url
Kill index.php from url
Diffstat (limited to 'lib/private/server.php')
| -rw-r--r-- | lib/private/server.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/private/server.php b/lib/private/server.php index bee70dec2df..5977ee9b5a0 100644 --- a/lib/private/server.php +++ b/lib/private/server.php @@ -128,7 +128,8 @@ class Server extends SimpleContainer implements IServerContainer { return new \OC\L10N\Factory(); }); $this->registerService('URLGenerator', function($c) { - return new \OC\URLGenerator(); + $config = $this->getConfig(); + return new \OC\URLGenerator($config); }); $this->registerService('AppHelper', function($c) { return new \OC\AppHelper(); @@ -257,7 +258,7 @@ class Server extends SimpleContainer implements IServerContainer { } /** - * @return \OC\Config + * @return \OCP\IConfig */ function getConfig() { return $this->query('AllConfig'); |