From 301d469813763cc28d82986f906eb29a45102294 Mon Sep 17 00:00:00 2001
From: Alexander Bergolth <leo@strike.wu.ac.at>
Date: Wed, 4 Dec 2013 18:01:51 +0100
Subject: [PATCH] Symfonys addCollection() with multiple arguments is
deprecated, fix deprecation warning
---
lib/private/router.php | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/lib/private/router.php b/lib/private/router.php
index dbaca9e0d5..19c1e4473e 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) {
--
GitLab