summaryrefslogtreecommitdiffstats
path: root/lib/private/router.php
diff options
context:
space:
mode:
authorAlexander Bergolth <leo@strike.wu.ac.at>2013-12-04 18:01:51 +0100
committerAlexander Bergolth <leo@strike.wu.ac.at>2013-12-04 18:01:51 +0100
commit301d469813763cc28d82986f906eb29a45102294 (patch)
treed4dd78dfc0e85b113ce98e5fb43315b9e1759d65 /lib/private/router.php
parent36bc6b871f7dbd27e5b764d7a218bfab6dba96c8 (diff)
downloadnextcloud-server-301d469813763cc28d82986f906eb29a45102294.tar.gz
nextcloud-server-301d469813763cc28d82986f906eb29a45102294.zip
Symfonys addCollection() with multiple arguments is deprecated, fix deprecation warning
Diffstat (limited to 'lib/private/router.php')
-rw-r--r--lib/private/router.php6
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/private/router.php b/lib/private/router.php
index dbaca9e0d5d..19c1e4473ec 100644
--- a/lib/private/router.php
+++ b/lib/private/router.php
@@ -67,7 +67,8 @@ class OC_Router {
$this->useCollection($app);
require_once $file;
$collection = $this->getCollection($app);
- $this->root->addCollection($collection, '/apps/'.$app);
+ $collection->addPrefix('/apps/'.$app);
+ $this->root->addCollection($collection);
}
$this->useCollection('root');
require_once 'settings/routes.php';
@@ -76,7 +77,8 @@ class OC_Router {
// include ocs routes
require_once 'ocs/routes.php';
$collection = $this->getCollection('ocs');
- $this->root->addCollection($collection, '/ocs');
+ $collection->addPrefix('/ocs');
+ $this->root->addCollection($collection);
}
protected function getCollection($name) {