diff options
| author | Robin Appelman <icewind@owncloud.com> | 2014-01-09 13:54:58 +0100 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2014-01-09 13:54:58 +0100 |
| commit | 5d456c7cc21f7640435c4638932984a52b4cdbac (patch) | |
| tree | 0227a865782fab4895f602a7c118d92e21998cbb /lib/private/server.php | |
| parent | d50c7391d8e78c9555b073fb9ccc6a91d5da34bc (diff) | |
| parent | d8b8abb429d3d66598a16d25cf55f7dc19e3f996 (diff) | |
| download | nextcloud-server-5d456c7cc21f7640435c4638932984a52b4cdbac.tar.gz nextcloud-server-5d456c7cc21f7640435c4638932984a52b4cdbac.zip | |
Merge branch 'master' into memcache-public
Diffstat (limited to 'lib/private/server.php')
| -rw-r--r-- | lib/private/server.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/private/server.php b/lib/private/server.php index 6b034a5be9f..c9e593ec2ed 100644 --- a/lib/private/server.php +++ b/lib/private/server.php @@ -128,7 +128,9 @@ class Server extends SimpleContainer implements IServerContainer { return new \OC\L10N\Factory(); }); $this->registerService('URLGenerator', function($c) { - return new \OC\URLGenerator(); + /** @var $c SimpleContainer */ + $config = $c->query('AllConfig'); + return new \OC\URLGenerator($config); }); $this->registerService('AppHelper', function($c) { return new \OC\AppHelper(); @@ -261,7 +263,7 @@ class Server extends SimpleContainer implements IServerContainer { } /** - * @return \OC\Config + * @return \OCP\IConfig */ function getConfig() { return $this->query('AllConfig'); |