summaryrefslogtreecommitdiffstats
path: root/lib/private/server.php
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2013-12-31 14:36:02 +0100
committerThomas Müller <thomas.mueller@tmit.eu>2013-12-31 14:36:02 +0100
commitae5671d2813f74562b77ae4288f01b4ed5ed52be (patch)
tree56144eb9746f798e827a0c70018ecb63c0c3e6de /lib/private/server.php
parent988710b0fc4e77b1a565a9f3ee4e7f24a539e057 (diff)
downloadnextcloud-server-ae5671d2813f74562b77ae4288f01b4ed5ed52be.tar.gz
nextcloud-server-ae5671d2813f74562b77ae4288f01b4ed5ed52be.zip
new config parameter 'front_controller_active' which will instruct the url generator to generate urls without index.php
Diffstat (limited to 'lib/private/server.php')
-rw-r--r--lib/private/server.php5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/private/server.php b/lib/private/server.php
index 77c3732a9ca..17565fafa46 100644
--- a/lib/private/server.php
+++ b/lib/private/server.php
@@ -120,7 +120,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();
@@ -249,7 +250,7 @@ class Server extends SimpleContainer implements IServerContainer {
}
/**
- * @return \OC\Config
+ * @return \OCP\IConfig
*/
function getConfig() {
return $this->query('AllConfig');