diff options
| author | Lukas Reschke <lukas@statuscode.ch> | 2016-08-11 19:37:17 +0200 |
|---|---|---|
| committer | Lukas Reschke <lukas@statuscode.ch> | 2016-08-11 19:37:17 +0200 |
| commit | 8261ccce1be32c1467874d537240585c0d841600 (patch) | |
| tree | 2b654700b2069eafbc2562e89621c748632c0e31 /lib/private/AppFramework | |
| parent | 225eb27bcac1e710a4aba723483745bb3677460f (diff) | |
| parent | f68f1d5f37e248aa7e5ac56e34fe79ce184ce149 (diff) | |
| download | nextcloud-server-8261ccce1be32c1467874d537240585c0d841600.tar.gz nextcloud-server-8261ccce1be32c1467874d537240585c0d841600.zip | |
Merge branch 'master' into implement_712
Diffstat (limited to 'lib/private/AppFramework')
| -rw-r--r-- | lib/private/AppFramework/Routing/RouteConfig.php | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/private/AppFramework/Routing/RouteConfig.php b/lib/private/AppFramework/Routing/RouteConfig.php index 066c0da1138..e94f2e50c1d 100644 --- a/lib/private/AppFramework/Routing/RouteConfig.php +++ b/lib/private/AppFramework/Routing/RouteConfig.php @@ -86,7 +86,13 @@ class RouteConfig { $postfix = $ocsRoute['postfix']; } - $url = $ocsRoute['url']; + if (isset($ocsRoute['root'])) { + $root = $ocsRoute['root']; + } else { + $root = '/apps/'.$this->appName; + } + + $url = $root . $ocsRoute['url']; $verb = isset($ocsRoute['verb']) ? strtoupper($ocsRoute['verb']) : 'GET'; $split = explode('#', $name, 2); |